merge devel

ecamp · Jul 9, 2024 · bda4bbc · bda4bbc
2 parents 861fd5a + 1b71704
commit bda4bbc
Show file tree

Hide file tree

Showing 137 changed files with 8,084 additions and 6,838 deletions.
diff --git a/.github/workflows/check-dependencies.yml b/.github/workflows/check-dependencies.yml
@@ -22,11 +22,11 @@ jobs:
     name: 'Api Platform check dependencies'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3.7'
+          php-version: '8.3.9'
           tools: composer:2.7.0
           coverage: xdebug
 

diff --git a/.github/workflows/continuous-integration-optional.yml b/.github/workflows/continuous-integration-optional.yml
@@ -17,11 +17,11 @@ jobs:
     name: 'Validate Api Platform composer.lock'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3.7'
+          php-version: '8.3.9'
           tools: composer:2.7.0
           coverage: xdebug
 
@@ -32,11 +32,11 @@ jobs:
     name: 'Lint: API (psalm)'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3.7'
+          php-version: '8.3.9'
           tools: composer:2.7.0
           coverage: xdebug
 
@@ -62,11 +62,11 @@ jobs:
     name: 'Lint: API (phpstan)'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3.7'
+          php-version: '8.3.9'
           tools: composer:2.7.0
           coverage: xdebug
 
@@ -110,11 +110,11 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3.7'
+          php-version: '8.3.9'
           tools: composer:2.7.0
           coverage: xdebug
 

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -25,15 +25,57 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  api-check-needed:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          skip_after_successful_duplicate: 'true'
+          paths: |
+            [
+              "api/**",
+              ".github/workflows/continuous-integration.yml"
+            ]
+          do_not_skip: '["workflow_dispatch", "schedule"]'
+
+  e2e-check-needed:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          skip_after_successful_duplicate: 'true'
+          paths: |
+            [
+              ".github/workflows/continuous-integration.yml",
+              "api/**",
+              "common/**",
+              "e2e/**",
+              "frontend/**",
+              "pdf/**",
+              "print/**",
+              "docker-compose.yml",
+              ".env.ci"
+            ]
+          do_not_skip: '["workflow_dispatch", "schedule"]'
+
   api-cs-check:
     name: 'Lint: API (php-cs-fixer)'
     runs-on: ubuntu-latest
+    needs:
+      - api-check-needed
+    if: needs.api-check-needed.outputs.should_skip != 'true'
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3.7'
+          php-version: '8.3.9'
           tools: composer:2.7.0
           coverage: none
 
@@ -59,7 +101,7 @@ jobs:
     name: 'Lint: Frontend (ESLint)'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: actions/setup-node@v4
         with:
@@ -88,7 +130,7 @@ jobs:
     name: 'Lint: ClientPrint (ESLint)'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: actions/setup-node@v4
         with:
@@ -117,7 +159,7 @@ jobs:
     name: 'Lint: Print (ESLint)'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: actions/setup-node@v4
         with:
@@ -145,8 +187,11 @@ jobs:
   e2e-lint:
     name: 'Lint: e2e (ESLint)'
     runs-on: ubuntu-latest
+    needs:
+      - e2e-check-needed
+    if: needs.e2e-check-needed.outputs.should_skip != 'true'
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: actions/setup-node@v4
         with:
@@ -174,6 +219,9 @@ jobs:
   api-tests:
     name: 'Tests: API'
     runs-on: ubuntu-latest
+    needs:
+      - api-check-needed
+    if: needs.api-check-needed.outputs.should_skip != 'true'
     env:
       TEST_DATABASE_URL: postgresql://ecamp3:ecamp3@localhost:5432/ecamp3test?serverVersion=15&charset=utf8
 
@@ -193,11 +241,11 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3.7'
+          php-version: '8.3.9'
           extensions: intl-73.1
           tools: composer:2.7.0
           coverage: pcov
@@ -251,7 +299,7 @@ jobs:
     name: 'Tests: Frontend'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: actions/setup-node@v4
         with:
@@ -294,7 +342,7 @@ jobs:
     name: 'Tests: Print'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: actions/setup-node@v4
         with:
@@ -333,7 +381,7 @@ jobs:
     name: 'Tests: PDF'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: actions/setup-node@v4
         with:
@@ -369,6 +417,9 @@ jobs:
   e2e-tests-build:
     name: 'Tests: End-to-end build'
     uses: ./.github/workflows/reusable-e2e-tests-build.yml
+    needs:
+      - e2e-check-needed
+    if: needs.e2e-check-needed.outputs.should_skip != 'true'
 
   e2e-tests-run:
     name: 'Tests: End-to-end run'
@@ -404,6 +455,7 @@ jobs:
       - frontend-tests
       - print-tests
       - pdf-tests
+      - e2e-tests-build
       - e2e-tests-run
     runs-on: ubuntu-latest
     if: always()
@@ -416,8 +468,8 @@ jobs:
             const needsObject = JSON.parse(needs);
 
             for (const [key, value] of Object.entries(needsObject)) {
-              if (value.result != 'success') {
-                core.setFailed(`Job ${key} failed`);
+              if (!['success', 'skipped'].includes(value.result)) {
+                core.setFailed(`Job ${key} failed with status ${value.result}`);
               }
             }
 

diff --git a/.github/workflows/deployment-pr-cleanup.yml b/.github/workflows/deployment-pr-cleanup.yml
@@ -13,7 +13,7 @@ jobs:
       to-uninstall: ${{ steps.to-uninstall.outputs.list }}
       never-uninstall: ${{ steps.to-uninstall.outputs.never_uninstall }}
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Find all open PRs that have a "deploy!" label
         id: deployment-candidates

diff --git a/.github/workflows/reusable-api-performance-test.yml b/.github/workflows/reusable-api-performance-test.yml
@@ -28,11 +28,11 @@ jobs:
           --memory 1G
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3.7'
+          php-version: '8.3.9'
           extensions: intl-73.1
           tools: composer:2.7.0
           coverage: pcov

diff --git a/.github/workflows/reusable-build-and-push.yml b/.github/workflows/reusable-build-and-push.yml
@@ -22,7 +22,7 @@ jobs:
     name: Build images and push
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
         with:
           ref: ${{ inputs.sha }}
 
@@ -36,7 +36,7 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: Build and push frontend docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: .docker-hub/frontend/Dockerfile
@@ -53,7 +53,7 @@ jobs:
           cache-to: type=gha,scope=frontend,mode=max
 
       - name: Build and push api docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: api/Dockerfile
@@ -66,7 +66,7 @@ jobs:
           cache-to: type=gha,scope=api,mode=max
 
       - name: Build and push print docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: .docker-hub/print/Dockerfile
@@ -83,7 +83,7 @@ jobs:
           cache-to: type=gha,scope=print,mode=max
 
       - name: Build and push varnish docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: .docker-hub/varnish/Dockerfile
@@ -95,7 +95,7 @@ jobs:
           cache-to: type=gha,scope=varnish,mode=max
 
       - name: Build and push db-backup-restore docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: .helm/ecamp3/files/db-backup-restore-image/Dockerfile

diff --git a/.github/workflows/reusable-dev-deployment.yml b/.github/workflows/reusable-dev-deployment.yml
@@ -61,7 +61,7 @@ jobs:
             |<span aria-hidden="true">🔍</span> Latest deploy log | [${{ steps.job-url.outputs.html_url }}](${{ steps.job-url.outputs.html_url }}) |
           comment_tag: feature-branch-deployment-status
 
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
         with:
           ref: ${{ inputs.sha }}
 

diff --git a/.github/workflows/reusable-e2e-tests-build.yml b/.github/workflows/reusable-e2e-tests-build.yml
@@ -9,15 +9,15 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3
 
       # build API (using cache; provide image to docker compose)
       - name: Build docker image (API/PHP)
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: api/Dockerfile
           context: './api'

diff --git a/.github/workflows/reusable-e2e-tests-run.yml b/.github/workflows/reusable-e2e-tests-run.yml
@@ -22,7 +22,7 @@ jobs:
           - firefox
           - edge
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - run: cp .env.ci .env
 

diff --git a/.github/workflows/reusable-stage-prod-deployment.yml b/.github/workflows/reusable-stage-prod-deployment.yml
@@ -16,7 +16,7 @@ jobs:
       environment: ${{ github.ref_name }}
       domain: ${{ vars.SUBDOMAIN }}.${{ vars.DOMAIN }}
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Create a pending GitHub deployment
         uses: bobheadxi/[email protected]

diff --git a/.helm/ecamp3/files/db-backup-restore-image/Dockerfile b/.helm/ecamp3/files/db-backup-restore-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:12.5-slim
+FROM debian:12.6-slim
 
 ENV DEBIAN_FRONTEND="noninteractive"
 RUN apt-get update && \

diff --git a/.ops/aws-setup/docker-compose.yml b/.ops/aws-setup/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   aws-setup:
-    image: pulumi/pulumi-nodejs:3.120.0
+    image: pulumi/pulumi-nodejs:3.122.0
     container_name: 'ecamp3-aws-setup'
     volumes:
       - ../../.prettierrc:/.prettierrc:delegated
@@ -13,7 +13,7 @@ services:
       - AWS_DEFAULT_REGION=eu-west-3
 
   aws-cli:
-    image: amazon/aws-cli:2.16.9
+    image: amazon/aws-cli:2.17.9
     container_name: 'ecamp3-aws-cli'
     volumes:
       - ./.aws:/root/.aws:delegated