foo

Author: marc-mabe

.github/workflows/test.yml

@@ -26,40 +26,44 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Cache Composer Install
-        id: cache-composer-install
+      - name: Cache Composer Phar
+        id: cache-composer-phar
         uses: actions/cache@v2
         with:
           path: composer.phar
-          key: composer.phar
+          key: cache-composer-phar
 
       - name: Install Composer
-        if: steps.cache-composer-install.outputs.cache-hit != 'true'
+        if: steps.cache-composer-phar.outputs.cache-hit != 'true'
         run: curl -sS https://getcomposer.org/installer | php -- --install-dir=. --filename=composer.phar
 
-      - name: Get Composer Config
-        id: composer-config
+      - name: Get Composer Setup
+        id: composer-setup
         run: |
+          echo "::set-output name=version::$(composer --version)"
           echo "::set-output name=cache-files-dir::$(composer config cache-files-dir)"
 
-      - name: Cache Composer Dependencies
+      - name: Cache Composer Cache Files
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-config.outputs.cache-files-dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          path: ${{ steps.composer-setup.outputs.cache-files-dir }}
+          key: cache-composer-cache-files-dir-${{ steps.composer-setup.outputs.version }}-${{ matrix.PHP_VERSION }}
+          restore-keys: |
+            cache-composer-cache-files-dir-${{ steps.composer-setup.outputs.version }}-
+            cache-composer-cache-files-dir-
 
       - name: Install Composer Dependencies
-        run: docker run --rm -v "$(pwd):/workdir" -w '/workdir' -v '${{ steps.composer-config.outputs.cache-files-dir }}:/.composer' -e 'COMPOSER_CACHE_DIR=/.composer' $PHP_IMAGE php ./composer.phar install --no-interaction --no-progress --prefer-dist ${{ matrix.COMPOSER_EXTRA_ARGS }}
+        run: docker run --rm -u "$(id -u):$(id -g)" -v "$(pwd):/workdir" -w '/workdir' -v '${{ steps.composer-setup.outputs.cache-files-dir }}:/.composer' -e 'COMPOSER_CACHE_DIR=/.composer' $PHP_IMAGE php ./composer.phar install --no-interaction --no-progress --prefer-dist ${{ matrix.COMPOSER_EXTRA_ARGS }}
 
       - name: Run Unit Test
-        run: docker run --rm -v "$(pwd):/workdir" -w '/workdir' $PHP_IMAGE php -d 'zend.assertions=1' ./vendor/bin/phpunit
+        run: docker run --rm -u "$(id -u):$(id -g)" -v "$(pwd):/workdir" -w '/workdir' $PHP_IMAGE php -d 'zend.assertions=1' ./vendor/bin/phpunit
 
       - name: Run PHPStan
-        run: docker run --rm -v "$(pwd):/workdir" -w '/workdir' $PHP_IMAGE php ./vendor/bin/phpstan analyse --level max src/ tests/
+        run: docker run --rm -u "$(id -u):$(id -g)" -v "$(pwd):/workdir" -w '/workdir' $PHP_IMAGE php ./vendor/bin/phpstan analyse --level max src/ tests/
 
       - name: Run psalm
-        run: docker run --rm -v "$(pwd):/workdir" -w '/workdir' $PHP_IMAGE php ./vendor/bin/psalm
+        run: echo $HOME; docker run --rm -u "$(id -u):$(id -g)" -v "$(pwd):/workdir" -w '/workdir' -v "$HOME/.cache/psalm:/.cache/psalm" $PHP_IMAGE php ./vendor/bin/psalm
 
       - name: Run benchmark
         if: ${{ matrix.RUN_BENCHMARK }}
-        run: docker run --rm -v "$(pwd):/workdir" -w '/workdir' $PHP_IMAGE php -d 'zend.assertions=-1' ./vendor/bin/phpbench run --no-interaction --revs=1 --retry-threshold=100 --progress=travis
+        run: docker run --rm -u "$(id -u):$(id -g)" -v "$(pwd):/workdir" -w '/workdir' $PHP_IMAGE php -d 'zend.assertions=-1' ./vendor/bin/phpbench run --no-interaction --revs=1 --retry-threshold=100 --progress=travis