Repo: sync github actions, makefile

contributte · Jan 10, 2021 · b521d03 · b521d03
1 parent 96d202d
commit b521d03
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 11 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -13,8 +13,9 @@ on:
 env:
   extensions: "json"
   cache-version: "1"
-  composer-version: "v1"
-  composer-install: "composer update --no-interaction --no-progress --no-suggest --prefer-dist --prefer-stable"
+  composer-version: "v2"
+  composer-install: "composer update --no-interaction --no-progress --prefer-dist --prefer-stable"
+  coverage: "none"
 
 jobs:
   qa:
@@ -51,7 +52,10 @@ jobs:
         with:
           php-version: "${{ matrix.php-version }}"
           extensions: "${{ env.extensions }}"
-          tools: "composer:${{ env.composer-version }} "
+          tools: "composer:${{ env.composer-version }}, cs2pr"
+          coverage: "${{ env.coverage }}"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Setup problem matchers for PHP"
         run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
@@ -110,7 +114,10 @@ jobs:
         with:
           php-version: "${{ matrix.php-version }}"
           extensions: "${{ env.extensions }}"
-          tools: "composer:${{ env.composer-version }} "
+          tools: "composer:${{ env.composer-version }}"
+          coverage: "${{ env.coverage }}"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Setup problem matchers for PHP"
         run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
@@ -150,8 +157,6 @@ jobs:
             composer-args: ""
       fail-fast: false
 
-    continue-on-error: "${{ matrix.php-version == '8.0' }}"
-
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
@@ -176,7 +181,10 @@ jobs:
         with:
           php-version: "${{ matrix.php-version }}"
           extensions: "${{ env.extensions }}"
-          tools: "composer:${{ env.composer-version }} "
+          tools: "composer:${{ env.composer-version }}"
+          coverage: "${{ env.coverage }}"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Setup problem matchers for PHP"
         run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
@@ -195,12 +203,16 @@ jobs:
       - name: "Install dependencies"
         run: "${{ env.composer-install }} ${{ matrix.composer-args }}"
 
-      - name: "Setup problem matchers for PHPUnit"
-        run: 'echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"'
-
       - name: "Tests"
         run: "make tests"
 
+      - name: "Upload test output"
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: output
+          path: tests/**/output
+
   tests-code-coverage:
     name: "Tests with code coverage"
     runs-on: "${{ matrix.operating-system }}"
@@ -237,7 +249,10 @@ jobs:
         with:
           php-version: "${{ matrix.php-version }}"
           extensions: "${{ env.extensions }}"
-          tools: "composer:${{ env.composer-version }} "
+          tools: "composer:${{ env.composer-version }}"
+          coverage: "${{ env.coverage }}"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Setup problem matchers for PHP"
         run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
@@ -259,6 +274,13 @@ jobs:
       - name: "Tests"
         run: "make coverage-clover"
 
+      - name: "Upload test output"
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: output
+          path: tests/**/output
+
       - name: "Coveralls.io"
         env:
           CI_NAME: github

diff --git a/Makefile b/Makefile
@@ -6,7 +6,11 @@ install:
 qa: phpstan cs
 
 cs:
+ifdef GITHUB_ACTION
+	vendor/bin/codesniffer -q --report=checkstyle src tests  | cs2pr
+else
 	vendor/bin/codesniffer src tests
+endif
 
 csf:
 	vendor/bin/codefixer src tests