Improve GitHub workflow configurations

codedmonkey · codedmonkey · commit ee418725da8b · 2025-03-18T08:53:13.000+01:00
diff --git a/.github/workflows/images-build.yaml b/.github/workflows/images-build.yaml
@@ -1,22 +1,18 @@
-name: Build image
+name: Build images
 
-on:
-  pull_request:
-  push:
+on: [pull_request, push]
 
 jobs:
-  build-image:
-    name: Test Docker build
+  build-standalone:
+    name: Test standalone build
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
           driver: docker-container
 
-      -
-        name: Build Docker image
+      - name: Build images
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
diff --git a/.github/workflows/images-publish.yaml b/.github/workflows/images-publish.yaml
@@ -1,31 +1,27 @@
-name: Publish image
+name: Publish images
 
 on:
   push:
-    tags:
-      - v*
+    tags: [v*]
   schedule:
-    -
-      cron:  "30 4 * * *"
+    - cron:  "30 4 * * *"
 
 jobs:
-  publish-image:
-    name: Publish Docker image
+  publish-standalone:
+    name: Publish standalone image
     runs-on: ubuntu-latest
     permissions:
       id-token: write
       contents: read
       packages: write
       attestations: write
     steps:
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
           driver: docker-container
 
-      -
-        name: Extract metadata for Docker
+      - name: Extract metadata for Docker
         id: meta
         uses: docker/metadata-action@v5
         with:
@@ -35,16 +31,14 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
 
-      -
-        name: Login to GitHub Packages
+      - name: Login to GitHub Packages
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      -
-        name: Build and push Docker image
+      - name: Build and push images
         id: push
         uses: docker/build-push-action@v6
         with:
@@ -53,8 +47,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64,linux/arm64
 
-      -
-        name: Generate artifact attestation
+      - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v2
         with:
           subject-name: ghcr.io/${{ github.repository }}
diff --git a/.github/workflows/linting.yaml b/.github/workflows/linting.yaml
@@ -3,12 +3,8 @@ name: Lint code & configuration
 on:
   pull_request:
   push:
-
-env:
-  fail-fast: true
-
-permissions:
-  contents: read
+  schedule:
+    - cron:  "30 4 * * *"
 
 jobs:
   linters:
@@ -22,8 +18,6 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          coverage: none
-          extensions: intl
           php-version: 8.3
           tools: composer:v2
 
@@ -48,7 +42,7 @@ jobs:
 
       - name: Lint Twig templates
         if: always() && steps.install.outcome == 'success'
-        run: bin/console lint:twig templates --env=prod
+        run: bin/console lint:twig templates
 
       #- name: Lint XLIFF translation files
       #  if: always() && steps.install.outcome == 'success'
@@ -58,17 +52,17 @@ jobs:
       #  if: always() && steps.install.outcome == 'success'
       #  run: bin/console lint:translations
 
-      - name: Lint Parameters and Services
+      - name: Lint service container # todo
         if: always() && steps.install.outcome == 'success'
-        run: bin/console lint:container --no-debug
+        run: bin/console lint:container
 
-      - name: Lint Composer config
+      - name: Lint Composer configuration
         if: always() && steps.install.outcome == 'success'
         run: composer validate
         # todo enable strict mode, currently license is invalid
         # run: composer validate --strict
 
-      - name: Check if any dependencies are compromised
+      - name: Check if any Composer dependencies are compromised
         if: always() && steps.install.outcome == 'success'
         run: composer audit
 
@@ -86,8 +80,6 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          coverage: none
-          extensions: intl
           php-version: 8.3
           tools: composer:v2
 
@@ -107,7 +99,7 @@ jobs:
         run: composer install --ansi --no-interaction --no-progress
 
       - name: PHP-CS-Fixer
-        run: ./vendor/bin/php-cs-fixer fix --diff --dry-run
+        run: vendor/bin/php-cs-fixer fix --diff --dry-run
 
   phpstan:
     name: PHPStan
@@ -120,8 +112,6 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          coverage: none
-          extensions: intl
           php-version: 8.3
           tools: composer:v2
 
@@ -142,4 +132,4 @@ jobs:
 
       - name: Run PHPStan
         if: always() && steps.install.outcome == 'success'
-        run: ./vendor/bin/phpstan analyze
+        run: vendor/bin/phpstan analyze
diff --git a/.github/workflows/tests-images.yaml b/.github/workflows/tests-images.yaml
@@ -1,20 +1,14 @@
 name: Run image tests
 
-on:
-  pull_request:
-  push:
+on: [pull_request, push]
 
 env:
-  fail-fast: true
   GITHUB_TOKEN: ${{ github.token }}
   PHPUNIT_FLAGS: ""
 
-permissions:
-  contents: read
-
 jobs:
-  phpunit:
-    name: Testcontainers
+  testcontainers:
+    name: Testcontainers (Standalone)
     runs-on: ubuntu-latest
     continue-on-error: false
 
@@ -34,8 +28,6 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          coverage: none
-          extensions: intl, mbstring, zip
           php-version: 8.3
           tools: composer:v2
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -1,56 +1,39 @@
 name: Run tests
 
-on:
-  pull_request:
-  push:
+on: [pull_request, push]
 
 env:
-  fail-fast: true
   GITHUB_TOKEN: ${{ github.token }}
   PHPUNIT_FLAGS: ""
 
-permissions:
-  contents: read
-
 jobs:
-  phpunit:
-    name: "PHPUnit (PHP ${{ matrix.php-version }})"
+  database:
+    name: Validate database components
     runs-on: ubuntu-latest
-    continue-on-error: false
 
     services:
       database:
         image: postgres:16-alpine
         ports:
           - "5432:5432"
         env:
-          POSTGRES_DB: dirigent_test
+          POSTGRES_DB: dirigent
           POSTGRES_PASSWORD: "!ChangeMe!"
           POSTGRES_USER: dirigent
 
-    strategy:
-      matrix:
-        php-version: ["8.3", "8.4"]
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          coverage: none
-          extensions: intl, mbstring, zip
-          php-version: ${{ matrix.php-version }}
+          php-version: 8.3
           tools: composer:v2
 
-      - name: Add PHPUnit matcher
-        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
       - name: Set Composer cache directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-        shell: bash
 
       - name: Cache Composer output
         uses: actions/cache@v4
@@ -59,59 +42,58 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
-      - name: Install Composer dependencies
+      - name: Install dependencies
+        id: install
         run: composer install --ansi --no-interaction --no-progress
 
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-
-      - name: Install Node dependencies
-        run: npm ci
-
-      - name: Build assets
-        run: npm run build
-
-      - name: Create database schema
-        run: bin/console --env=test doctrine:schema:create
+      - name: Validate mapping
+        run: bin/console doctrine:schema:validate --skip-sync --no-interaction -vvv
 
-      - name: Load database fixtures
-        run: bin/console --env=test doctrine:fixtures:load --no-interaction
+      - name: Execute migrations
+        run: bin/console doctrine:migrations:migrate --no-interaction -v
 
-      - name: PHPUnit version
-        run: bin/phpunit --version
+      - name: Validate schema
+        run: bin/console doctrine:schema:validate --skip-mapping --skip-property-types --no-interaction -vvv
 
-      - name: Run tests
-        run: bin/phpunit ${{ env.PHPUNIT_FLAGS }}
+      - name: Load fixtures
+        run: bin/console doctrine:fixtures:load --no-interaction -vvv
 
-  database:
-    name: Validate database components
+  phpunit:
+    name: "PHPUnit (PHP ${{ matrix.php-version }})"
     runs-on: ubuntu-latest
+    continue-on-error: false
 
     services:
       database:
         image: postgres:16-alpine
         ports:
           - "5432:5432"
         env:
-          POSTGRES_DB: dirigent
+          POSTGRES_DB: dirigent_test
           POSTGRES_PASSWORD: "!ChangeMe!"
           POSTGRES_USER: dirigent
 
+    strategy:
+      matrix:
+        php-version: ["8.3", "8.4"]
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          coverage: none
-          extensions: intl
-          php-version: 8.3
+          php-version: ${{ matrix.php-version }}
           tools: composer:v2
 
+      - name: Add PHPUnit matcher
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
       - name: Set Composer cache directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+        shell: bash
 
       - name: Cache Composer output
         uses: actions/cache@v4
@@ -120,18 +102,26 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
-      - name: Install dependencies
-        id: install
+      - name: Install Composer dependencies
         run: composer install --ansi --no-interaction --no-progress
 
-      - name: Validate mapping
-        run: bin/console doctrine:schema:validate --skip-sync --no-interaction -vvv
+      - name: Install Node.js
+        uses: actions/setup-node@v4
 
-      - name: Execute migrations
-        run: bin/console doctrine:migrations:migrate --no-interaction -v
+      - name: Install Node dependencies
+        run: npm ci
 
-      - name: Validate schema
-        run: bin/console doctrine:schema:validate --skip-mapping --skip-property-types --no-interaction -vvv
+      - name: Build assets
+        run: npm run build
 
-      - name: Load fixtures
-        run: bin/console doctrine:fixtures:load --no-interaction -vvv
+      - name: Create database schema
+        run: bin/console doctrine:schema:create --env=test
+
+      - name: Load database fixtures
+        run: bin/console doctrine:fixtures:load --env=test --no-interaction
+
+      - name: PHPUnit version
+        run: bin/phpunit --version
+
+      - name: Run tests
+        run: bin/phpunit ${{ env.PHPUNIT_FLAGS }}
