From 9d0e77d8a528cb15f3e1bfd0b786cbe975cafca3 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Tue, 17 Sep 2024 10:00:13 +0200
Subject: [PATCH] Move all jobs to `ci.yaml` + streamline (#245)

* Move all jobs to `ci.yaml`

* -
---
 .github/workflows/ci.yml     | 76 +++++++++++++++++++++++++++++-------
 .github/workflows/static.yml | 67 -------------------------------
 2 files changed, 62 insertions(+), 81 deletions(-)
 delete mode 100644 .github/workflows/static.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 86f3260..dd32b6d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.7.0
+        uses: shivammathur/setup-php@v2
         with:
           php-version: 8.3
           coverage: none
@@ -21,19 +21,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: composer-${{ runner.os }}-8.1-${{ hashFiles('composer.*') }}
-          restore-keys: |
-            composer-${{ runner.os }}-8.1-
-            composer-${{ runner.os }}-
-            composer-
+      - name: Download dependencies
+        uses: ramsey/composer-install@v3
 
       - name: Docker
         run: docker compose up -d
@@ -54,3 +43,62 @@ jobs:
           name: test.log
           path: var/log/test.log
           retention-days: 5
+
+  phpstan:
+    name: PHPStan
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+          coverage: none
+          tools: phpstan:1.10, cs2pr
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download dependencies
+        uses: ramsey/composer-install@v3
+
+      - name: PHPStan
+        run: phpstan analyze --no-progress --error-format=checkstyle | cs2pr
+
+  php-cs-fixer:
+    name: PHP-CS-Fixer
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+          coverage: none
+          tools: php-cs-fixer:3.42, cs2pr
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: PHP-CS-Fixer
+        run: php-cs-fixer fix --dry-run --format=checkstyle | cs2pr
+
+  psalm:
+    name: Psalm
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+          coverage: none
+          tools: vimeo/psalm:5.18.0
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download dependencies
+        uses: ramsey/composer-install@v3
+
+      - name: Psalm
+        run: psalm --no-progress --output-format=github
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
deleted file mode 100644
index 2809b9c..0000000
--- a/.github/workflows/static.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-name: Static analysis
-
-on:
-  pull_request: ~
-  push:
-    branches:
-      - master
-
-jobs:
-  phpstan:
-    name: PHPStan
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.3
-          coverage: none
-          tools: phpstan:1.10, cs2pr
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Download dependencies
-        uses: ramsey/composer-install@v3
-
-      - name: PHPStan
-        run: phpstan analyze --no-progress --error-format=checkstyle | cs2pr
-
-  php-cs-fixer:
-    name: PHP-CS-Fixer
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.3
-          coverage: none
-          tools: php-cs-fixer:3.42, cs2pr
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: PHP-CS-Fixer
-        run: php-cs-fixer fix --dry-run --format=checkstyle | cs2pr
-
-  psalm:
-    name: Psalm
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.3
-          coverage: none
-          tools: vimeo/psalm:5.18.0
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Download dependencies
-        uses: ramsey/composer-install@v3
-
-      - name: Psalm
-        run: psalm --no-progress --output-format=github