Merge 6dab122 into e1bd399

.github/workflows/main.yml

@@ -38,14 +38,11 @@ jobs:
     strategy:
       matrix:
         php-version: [ 7.2, 7.3, 7.4 ]
-        experimental: [ false ]
-        composer_flags: [ "--prefer-lowest", "" ]
         build-way: ["build", "update"]
+        composer_flags: [ "--prefer-lowest", "" ]
         include:
-          - php-version: "8.0"
-            experimental: true
-          - php-version: "8.1"
-            experimental: true
+          - php-version: 8.0
+            build-way: update
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -60,17 +57,15 @@ jobs:
           tools: composer
 
       - name: Build the Project
-        continue-on-error: ${{ matrix.experimental }}
         run: make ${{ matrix.build-way }} --no-print-directory
 
       - name: 🧪 PHPUnit Tests
-        continue-on-error: ${{ matrix.experimental }}
+        if: ${{ !(matrix.build-way == 'build' && matrix.php-version == 8.0) }}
         run: make test --no-print-directory
 
       - name: Codecov Report
         uses: codecov/codecov-action@v1
-        if: ${{ matrix.build-way == 'update' && matrix.php-version == '7.4' }}
-        continue-on-error: ${{ matrix.experimental }}
+        if: ${{ matrix.php-version == 7.4 || matrix.php-version == 8.0 }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: '*.xml'
@@ -83,13 +78,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: [ 7.4 ]
-        experimental: [ false ]
-        include:
-          - php-version: "8.0"
-            experimental: true
-          - php-version: "8.1"
-            experimental: true
+        php-version: [ 7.2, 7.3, 7.4 ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -103,11 +92,9 @@ jobs:
           tools: composer
 
       - name: Build the Project
-        continue-on-error: ${{ matrix.experimental }}
         run: make update --no-print-directory
 
       - name: 👍 Code Quality
-        continue-on-error: ${{ matrix.experimental }}
         run: make codestyle --no-print-directory
 
 
@@ -118,10 +105,9 @@ jobs:
       matrix:
         php-version: [ 7.2, 7.3, 7.4 ]
         experimental: [ false ]
+        build-way: ["build", "update"]
         include:
-          - php-version: "8.0"
-            experimental: true
-          - php-version: "8.1"
+          - php-version: 8.0
             experimental: true
     steps:
       - name: Checkout code
@@ -137,17 +123,11 @@ jobs:
 
       - name: Building Phar binary file
         continue-on-error: ${{ matrix.experimental }}
-        run: make build --no-print-directory
+        run: make ${{ matrix.build-way }} --no-print-directory
 
       - name: Trying to use the phar file
         continue-on-error: ${{ matrix.experimental }}
-        run: |
-          echo "::group::Try to run it"
-          ./build/ci-report-converter.phar
-          echo "::endgroup::"
-          echo "::group::Show help message"
-          ./build/ci-report-converter.phar --help
-          echo "::endgroup::"
+        run: ./build/ci-report-converter.phar convert --help
 
 
   docker:
@@ -163,13 +143,7 @@ jobs:
         run: make build-docker
 
       - name: Trying to use the Docker Image
-        run: |
-          echo "::group::Try to run it"
-          docker run --rm jbzoo-ci-report-converter
-          echo "::endgroup::"
-          echo "::group::Show help message"
-          docker run --rm jbzoo-ci-report-converter convert --help
-          echo "::endgroup::"
+        run: docker run --rm jbzoo-ci-report-converter convert --help
 
 
   release:
@@ -192,4 +166,4 @@ jobs:
         with:
           body: ${{steps.github_release.outputs.changelog}}
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -17,3 +17,4 @@ build
 vendor
 phpunit.xml
 *.cache
+ci-report-converter.phar

Makefile

@@ -32,6 +32,7 @@ build-docker:
 update: ##@Project Install/Update all 3rd party dependencies
 	@echo "Composer flags: $(JBZOO_COMPOSER_UPDATE_FLAGS)"
 	@composer update --optimize-autoloader --no-progress $(JBZOO_COMPOSER_UPDATE_FLAGS)
+	@$(PHP_BIN) `pwd`/vendor/bin/composer-diff
 	@make create-symlink
 	@make build-phar