From 3724e2cdd33f43c4895855422a9ecb601232cb68 Mon Sep 17 00:00:00 2001
From: Jonas Staudenmeir <mail@jonas-staudenmeir.de>
Date: Sun, 28 Jan 2024 21:10:04 +0100
Subject: [PATCH] ci

---
 .github/workflows/ci.yml              |  6 +++---
 .github/workflows/static-analysis.yml | 26 ++++++++++++++++++--------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 43bb031..f802583 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,14 +23,14 @@ jobs:
           key: php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
       - name: Check out code
         uses: actions/checkout@v4
-        if: steps.pull.outcome != 'success'
       - name: Install dependencies
         run: |
           docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm php${{ matrix.php }} \
             composer update --no-interaction --no-progress --prefer-dist --prefer-${{ matrix.release }}
       - name: Run tests
-        run: docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm php${{ matrix.php }} \
-          vendor/bin/phpunit ${{ env.COVERAGE }}
+        run: |
+          docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm php${{ matrix.php }} \
+            vendor/bin/phpunit ${{ env.COVERAGE }}
         env:
           COVERAGE: ${{ matrix.coverage && '--coverage-clover=coverage.xml' || '' }}
       - name: Upload code coverage
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index de43a9f..22c29ee 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -6,14 +6,24 @@ jobs:
   phpstan:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        php: [ 8.3 ]
+        release: [ stable ]
+
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
         with:
           path: ~/.cache/composer/files
-          key: php-8.3-composer-${{ hashFiles('**/composer.json') }}
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.3
-      - run: composer update --no-interaction --no-progress --prefer-dist
-      - run: vendor/bin/phpstan analyse --error-format=github
+          key: php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm php${{ matrix.php }} \
+            composer update --no-interaction --no-progress --prefer-dist --prefer-${{ matrix.release }}
+      - name: Analyse code
+        run: |
+          docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm php${{ matrix.php }} \
+            vendor/bin/phpstan analyse --error-format=github