Merge pull request #3 from shrink/feature/build-artifacts

Expose PHPUnit and Psalm test reports as build artifacts

Author: shrink

.editorconfig

@@ -11,5 +11,5 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.{yml,yaml}]
+[*.{yml,yaml,json}]
 indent_size = 2

.gitignore

@@ -5,3 +5,5 @@
 .env
 .env.backup
 .phpunit.result.cache
+artifacts/
+junit.xml

.gitlab-ci.yml

@@ -1,12 +1,22 @@
-image: docker:18
+image: docker:19
 
 services:
   - docker:dind
 
 stages:
   - build
 
-build:
+app:
   stage: build
+  only:
+    - branches
+    - merge_requests
+    - tags
   script:
-    - docker build --tag test .
+    - docker build .
+  after_script:
+    - CID=$(docker create $(docker images --format='{{.ID}}' | head -1))
+    - docker cp ${CID}:/srv/artifacts .
+  artifacts:
+    reports:
+      junit: artifacts/*.xml

.meta/githooks/pre-commit

@@ -1 +1 @@
-make insights
+make quality

Dockerfile

@@ -42,12 +42,18 @@ COPY . /srv
 RUN composer dump-autoload
 
 FROM dependencies as test
-RUN composer quality
+RUN composer quality || echo "error" > error.exit
+
+RUN mv junit.xml artifacts/psalm.xml
+RUN [[ ! -f error.exit ]] && exit 0
 
 FROM dependencies as clean
 RUN composer install --no-dev
 RUN composer dump-autoload --optimize
 
 FROM php
 COPY . /srv
+COPY --from=test /srv/artifacts /srv/artifacts
 COPY --from=clean /srv/vendor /srv/vendor
+
+WORKDIR /srv

Makefile

@@ -19,6 +19,10 @@ begin:
 serve:
 	docker-compose up
 
+# Build the application Docker image
+build:
+    docker build . && (docker images --format='{{.ID}}' | head -1)
+
 # Run the application's quality check
 quality:
 	${COMPOSER_COMMAND} quality

composer.json

@@ -68,7 +68,7 @@
             "@php artisan insights --ansi --no-interaction --config-path=config/insights.php"
         ],
         "static": [
-            "vendor/bin/psalm --long-progress"
+            "vendor/bin/psalm --long-progress --report=junit.xml"
         ]
     }
 }