Improve workflows by using ramsey composer install action

Runroom · Jun 2, 2021 · 863cc79 · 863cc79
1 parent 1f6574b
commit 863cc79
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 39 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,11 +10,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['7.4', '8.0']
+        php: ['7.4']
         dependencies: [highest]
         include:
           - php: '7.4'
             dependencies: lowest
+          - php: '8.0'
+            dependencies: highest
+            composer-options: "--ignore-platform-req=php"
     steps:
       - uses: actions/checkout@v2
       - uses: shivammathur/setup-php@v2
@@ -24,18 +27,9 @@ jobs:
           ini-values: pcov.directory=packages
           coverage: pcov
       - run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-      - id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
+      - uses: ramsey/composer-install@v1
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ matrix.dependencies }}
-          restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer-
-      - if: matrix.php == '8.0'
-        run: composer config platform.php 7.4.99
-      - if: matrix.dependencies == 'lowest'
-        run: composer update --no-interaction --no-progress --prefer-lowest
-      - if: matrix.dependencies == 'highest'
-        run: composer update --no-interaction --no-progress
+          dependency-versions: ${{ matrix.dependencies }}
+          composer-options: ${{ matrix.composer-options }}
       - run: vendor/bin/phpunit --coverage-clover=clover.xml
       - uses: codecov/codecov-action@v1
diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -19,13 +19,7 @@ jobs:
           extensions: zip, pdo_sqlite, gd
           coverage: none
           tools: cs2pr
-      - id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-${{ matrix.php }}-composer
-      - run: composer update --no-interaction --no-progress
+      - uses: ramsey/composer-install@v1
       - run: composer php-cs-fixer -- --dry-run --format=checkstyle | cs2pr
       - run: vendor/bin/phpunit
       - run: composer phpstan

diff --git a/.github/workflows/split_ci.yaml b/.github/workflows/split_ci.yaml
@@ -21,14 +21,7 @@ jobs:
           php-version: ${{ matrix.php }}
           extensions: zip, pdo_sqlite, gd
           coverage: none
-      - id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ matrix.packages }}
-          restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer-
-      - run: composer update --no-interaction --no-progress
+      - uses: ramsey/composer-install@v1
       - id: output_data
         run: echo "::set-output name=matrix::$(vendor/bin/monorepo-builder packages-json --tests)"
     outputs:
@@ -46,17 +39,14 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: zip, pdo_sqlite, gd
-          coverage: none
+          ini-values: pcov.directory=packages
+          coverage: pcov
       - run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-      - id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ matrix.packages }}
-          restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer-
       - run: cd packages/${{ matrix.packages }} && composer validate --strict
-      - run: composer update --no-interaction --no-progress
+      - uses: ramsey/composer-install@v1
       - run: vendor/bin/monorepo-builder localize-composer-paths packages/${{ matrix.packages }}/composer.json --ansi
-      - run: composer update --no-interaction --no-progress --working-dir packages/${{ matrix.packages }}
-      - run: cd packages/${{ matrix.packages }} && vendor/bin/phpunit
+      - uses: ramsey/composer-install@v1
+        with:
+          composer-options: --working-dir=packages/${{ matrix.packages }}
+      - run: cd packages/${{ matrix.packages }} && vendor/bin/phpunit --coverage-clover=clover.xml
+      - uses: codecov/codecov-action@v1