Skip to content

Commit bda4bbc

Browse files
usuusu
committed
merge devel
2 parents 861fd5a + 1b71704 commit bda4bbc

File tree

137 files changed

+8084
-6838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+8084
-6838
lines changed

‎.github/workflows/check-dependencies.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
name: 'Api Platform check dependencies'
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
25+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
2626

2727
- uses: shivammathur/setup-php@v2
2828
with:
29-
php-version: '8.3.7'
29+
php-version: '8.3.9'
3030
tools: composer:2.7.0
3131
coverage: xdebug
3232

‎.github/workflows/continuous-integration-optional.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
name: 'Validate Api Platform composer.lock'
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
20+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
2121

2222
- uses: shivammathur/setup-php@v2
2323
with:
24-
php-version: '8.3.7'
24+
php-version: '8.3.9'
2525
tools: composer:2.7.0
2626
coverage: xdebug
2727

@@ -32,11 +32,11 @@ jobs:
3232
name: 'Lint: API (psalm)'
3333
runs-on: ubuntu-latest
3434
steps:
35-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
35+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
3636

3737
- uses: shivammathur/setup-php@v2
3838
with:
39-
php-version: '8.3.7'
39+
php-version: '8.3.9'
4040
tools: composer:2.7.0
4141
coverage: xdebug
4242

@@ -62,11 +62,11 @@ jobs:
6262
name: 'Lint: API (phpstan)'
6363
runs-on: ubuntu-latest
6464
steps:
65-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
65+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
6666

6767
- uses: shivammathur/setup-php@v2
6868
with:
69-
php-version: '8.3.7'
69+
php-version: '8.3.9'
7070
tools: composer:2.7.0
7171
coverage: xdebug
7272

@@ -110,11 +110,11 @@ jobs:
110110
--health-retries 5
111111
112112
steps:
113-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
113+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
114114

115115
- uses: shivammathur/setup-php@v2
116116
with:
117-
php-version: '8.3.7'
117+
php-version: '8.3.9'
118118
tools: composer:2.7.0
119119
coverage: xdebug
120120

‎.github/workflows/continuous-integration.yml‎

Lines changed: 65 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,57 @@ concurrency:
2525
cancel-in-progress: true
2626

2727
jobs:
28+
api-check-needed:
29+
runs-on: ubuntu-latest
30+
outputs:
31+
should_skip: ${{ steps.skip_check.outputs.should_skip }}
32+
steps:
33+
- id: skip_check
34+
uses: fkirc/skip-duplicate-actions@v5
35+
with:
36+
skip_after_successful_duplicate: 'true'
37+
paths: |
38+
[
39+
"api/**",
40+
".github/workflows/continuous-integration.yml"
41+
]
42+
do_not_skip: '["workflow_dispatch", "schedule"]'
43+
44+
e2e-check-needed:
45+
runs-on: ubuntu-latest
46+
outputs:
47+
should_skip: ${{ steps.skip_check.outputs.should_skip }}
48+
steps:
49+
- id: skip_check
50+
uses: fkirc/skip-duplicate-actions@v5
51+
with:
52+
skip_after_successful_duplicate: 'true'
53+
paths: |
54+
[
55+
".github/workflows/continuous-integration.yml",
56+
"api/**",
57+
"common/**",
58+
"e2e/**",
59+
"frontend/**",
60+
"pdf/**",
61+
"print/**",
62+
"docker-compose.yml",
63+
".env.ci"
64+
]
65+
do_not_skip: '["workflow_dispatch", "schedule"]'
66+
2867
api-cs-check:
2968
name: 'Lint: API (php-cs-fixer)'
3069
runs-on: ubuntu-latest
70+
needs:
71+
- api-check-needed
72+
if: needs.api-check-needed.outputs.should_skip != 'true'
3173
steps:
32-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
74+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
3375

3476
- uses: shivammathur/setup-php@v2
3577
with:
36-
php-version: '8.3.7'
78+
php-version: '8.3.9'
3779
tools: composer:2.7.0
3880
coverage: none
3981

@@ -59,7 +101,7 @@ jobs:
59101
name: 'Lint: Frontend (ESLint)'
60102
runs-on: ubuntu-latest
61103
steps:
62-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
104+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
63105

64106
- uses: actions/setup-node@v4
65107
with:
@@ -88,7 +130,7 @@ jobs:
88130
name: 'Lint: ClientPrint (ESLint)'
89131
runs-on: ubuntu-latest
90132
steps:
91-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
133+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
92134

93135
- uses: actions/setup-node@v4
94136
with:
@@ -117,7 +159,7 @@ jobs:
117159
name: 'Lint: Print (ESLint)'
118160
runs-on: ubuntu-latest
119161
steps:
120-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
162+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
121163

122164
- uses: actions/setup-node@v4
123165
with:
@@ -145,8 +187,11 @@ jobs:
145187
e2e-lint:
146188
name: 'Lint: e2e (ESLint)'
147189
runs-on: ubuntu-latest
190+
needs:
191+
- e2e-check-needed
192+
if: needs.e2e-check-needed.outputs.should_skip != 'true'
148193
steps:
149-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
194+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
150195

151196
- uses: actions/setup-node@v4
152197
with:
@@ -174,6 +219,9 @@ jobs:
174219
api-tests:
175220
name: 'Tests: API'
176221
runs-on: ubuntu-latest
222+
needs:
223+
- api-check-needed
224+
if: needs.api-check-needed.outputs.should_skip != 'true'
177225
env:
178226
TEST_DATABASE_URL: postgresql://ecamp3:ecamp3@localhost:5432/ecamp3test?serverVersion=15&charset=utf8
179227

@@ -193,11 +241,11 @@ jobs:
193241
--health-retries 5
194242
195243
steps:
196-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
244+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
197245

198246
- uses: shivammathur/setup-php@v2
199247
with:
200-
php-version: '8.3.7'
248+
php-version: '8.3.9'
201249
extensions: intl-73.1
202250
tools: composer:2.7.0
203251
coverage: pcov
@@ -251,7 +299,7 @@ jobs:
251299
name: 'Tests: Frontend'
252300
runs-on: ubuntu-latest
253301
steps:
254-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
302+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
255303

256304
- uses: actions/setup-node@v4
257305
with:
@@ -294,7 +342,7 @@ jobs:
294342
name: 'Tests: Print'
295343
runs-on: ubuntu-latest
296344
steps:
297-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
345+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
298346

299347
- uses: actions/setup-node@v4
300348
with:
@@ -333,7 +381,7 @@ jobs:
333381
name: 'Tests: PDF'
334382
runs-on: ubuntu-latest
335383
steps:
336-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
384+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
337385

338386
- uses: actions/setup-node@v4
339387
with:
@@ -369,6 +417,9 @@ jobs:
369417
e2e-tests-build:
370418
name: 'Tests: End-to-end build'
371419
uses: ./.github/workflows/reusable-e2e-tests-build.yml
420+
needs:
421+
- e2e-check-needed
422+
if: needs.e2e-check-needed.outputs.should_skip != 'true'
372423

373424
e2e-tests-run:
374425
name: 'Tests: End-to-end run'
@@ -404,6 +455,7 @@ jobs:
404455
- frontend-tests
405456
- print-tests
406457
- pdf-tests
458+
- e2e-tests-build
407459
- e2e-tests-run
408460
runs-on: ubuntu-latest
409461
if: always()
@@ -416,8 +468,8 @@ jobs:
416468
const needsObject = JSON.parse(needs);
417469
418470
for (const [key, value] of Object.entries(needsObject)) {
419-
if (value.result != 'success') {
420-
core.setFailed(`Job ${key} failed`);
471+
if (!['success', 'skipped'].includes(value.result)) {
472+
core.setFailed(`Job ${key} failed with status ${value.result}`);
421473
}
422474
}
423475

‎.github/workflows/deployment-pr-cleanup.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
to-uninstall: ${{ steps.to-uninstall.outputs.list }}
1414
never-uninstall: ${{ steps.to-uninstall.outputs.never_uninstall }}
1515
steps:
16-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
16+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
1717

1818
- name: Find all open PRs that have a "deploy!" label
1919
id: deployment-candidates

‎.github/workflows/reusable-api-performance-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ jobs:
2828
--memory 1G
2929
3030
steps:
31-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
31+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
3232

3333
- uses: shivammathur/setup-php@v2
3434
with:
35-
php-version: '8.3.7'
35+
php-version: '8.3.9'
3636
extensions: intl-73.1
3737
tools: composer:2.7.0
3838
coverage: pcov

‎.github/workflows/reusable-build-and-push.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
name: Build images and push
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
25+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
2626
with:
2727
ref: ${{ inputs.sha }}
2828

@@ -36,7 +36,7 @@ jobs:
3636
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
3737

3838
- name: Build and push frontend docker image
39-
uses: docker/build-push-action@v5
39+
uses: docker/build-push-action@v6
4040
with:
4141
push: true
4242
file: .docker-hub/frontend/Dockerfile
@@ -53,7 +53,7 @@ jobs:
5353
cache-to: type=gha,scope=frontend,mode=max
5454

5555
- name: Build and push api docker image
56-
uses: docker/build-push-action@v5
56+
uses: docker/build-push-action@v6
5757
with:
5858
push: true
5959
file: api/Dockerfile
@@ -66,7 +66,7 @@ jobs:
6666
cache-to: type=gha,scope=api,mode=max
6767

6868
- name: Build and push print docker image
69-
uses: docker/build-push-action@v5
69+
uses: docker/build-push-action@v6
7070
with:
7171
push: true
7272
file: .docker-hub/print/Dockerfile
@@ -83,7 +83,7 @@ jobs:
8383
cache-to: type=gha,scope=print,mode=max
8484

8585
- name: Build and push varnish docker image
86-
uses: docker/build-push-action@v5
86+
uses: docker/build-push-action@v6
8787
with:
8888
push: true
8989
file: .docker-hub/varnish/Dockerfile
@@ -95,7 +95,7 @@ jobs:
9595
cache-to: type=gha,scope=varnish,mode=max
9696

9797
- name: Build and push db-backup-restore docker image
98-
uses: docker/build-push-action@v5
98+
uses: docker/build-push-action@v6
9999
with:
100100
push: true
101101
file: .helm/ecamp3/files/db-backup-restore-image/Dockerfile

‎.github/workflows/reusable-dev-deployment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
|<span aria-hidden="true">🔍</span> Latest deploy log | [${{ steps.job-url.outputs.html_url }}](${{ steps.job-url.outputs.html_url }}) |
6262
comment_tag: feature-branch-deployment-status
6363

64-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
64+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
6565
with:
6666
ref: ${{ inputs.sha }}
6767

‎.github/workflows/reusable-e2e-tests-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ jobs:
99
runs-on: ubuntu-latest
1010
timeout-minutes: 20
1111
steps:
12-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
12+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
1313

1414
- name: Set up Docker Buildx
1515
id: buildx
1616
uses: docker/setup-buildx-action@v3
1717

1818
# build API (using cache; provide image to docker compose)
1919
- name: Build docker image (API/PHP)
20-
uses: docker/build-push-action@v5
20+
uses: docker/build-push-action@v6
2121
with:
2222
file: api/Dockerfile
2323
context: './api'

‎.github/workflows/reusable-e2e-tests-run.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- firefox
2323
- edge
2424
steps:
25-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
25+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
2626

2727
- run: cp .env.ci .env
2828

‎.github/workflows/reusable-stage-prod-deployment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
environment: ${{ github.ref_name }}
1717
domain: ${{ vars.SUBDOMAIN }}.${{ vars.DOMAIN }}
1818
steps:
19-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
19+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
2020

2121
- name: Create a pending GitHub deployment
2222
uses: bobheadxi/[email protected]

0 commit comments

Comments
 (0)