Skip to content

Commit fc0fff9

Browse files
usuusu
committed
Merge remote-tracking branch 'ecamp/devel' into chore/disable-symfony-listeners
2 parents 1076889 + fdf4413 commit fc0fff9

File tree

160 files changed

+14470
-11023
lines changed

Some content is hidden

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

160 files changed

+14470
-11023
lines changed

‎.caddy/data/.gitkeep‎

Whitespace-only changes.

‎.caddy/php-socket/.gitkeep‎

Whitespace-only changes.

‎.docker-hub/print/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# build stage
2-
FROM node:20.14.0 AS build-stage
2+
FROM node:22.3.0 AS build-stage
33
ARG SENTRY_AUTH_TOKEN
44
ARG SENTRY_ORG
55
ARG SENTRY_PRINT_PROJECT
@@ -22,7 +22,7 @@ COPY print .
2222
RUN npm run build
2323

2424
# production stage
25-
FROM node:20.14.0 AS production-stage
25+
FROM node:22.3.0 AS production-stage
2626
WORKDIR /app
2727

2828
COPY --from=build-stage /app/.output ./.output

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ 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:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ 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:
@@ -32,7 +32,7 @@ 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:
@@ -62,7 +62,7 @@ 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:
@@ -110,7 +110,7 @@ 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:

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
name: 'Lint: API (php-cs-fixer)'
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
32+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
3333

3434
- uses: shivammathur/setup-php@v2
3535
with:
@@ -59,11 +59,11 @@ jobs:
5959
name: 'Lint: Frontend (ESLint)'
6060
runs-on: ubuntu-latest
6161
steps:
62-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
62+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
6363

6464
- uses: actions/setup-node@v4
6565
with:
66-
node-version: '20.14.0'
66+
node-version: '22.3.0'
6767

6868
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
6969
with:
@@ -88,11 +88,11 @@ jobs:
8888
name: 'Lint: ClientPrint (ESLint)'
8989
runs-on: ubuntu-latest
9090
steps:
91-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
91+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
9292

9393
- uses: actions/setup-node@v4
9494
with:
95-
node-version: '20.14.0'
95+
node-version: '22.3.0'
9696

9797
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
9898
with:
@@ -117,11 +117,11 @@ jobs:
117117
name: 'Lint: Print (ESLint)'
118118
runs-on: ubuntu-latest
119119
steps:
120-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
120+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
121121

122122
- uses: actions/setup-node@v4
123123
with:
124-
node-version: '20.14.0'
124+
node-version: '22.3.0'
125125

126126
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
127127
with:
@@ -146,11 +146,11 @@ jobs:
146146
name: 'Lint: e2e (ESLint)'
147147
runs-on: ubuntu-latest
148148
steps:
149-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
149+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
150150

151151
- uses: actions/setup-node@v4
152152
with:
153-
node-version: '20.14.0'
153+
node-version: '22.3.0'
154154

155155
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
156156
with:
@@ -193,7 +193,7 @@ jobs:
193193
--health-retries 5
194194
195195
steps:
196-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
196+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
197197

198198
- uses: shivammathur/setup-php@v2
199199
with:
@@ -233,6 +233,8 @@ jobs:
233233

234234
- run: composer test
235235
working-directory: api
236+
env:
237+
PERFORMANCE_TEST_DEBUG_OUTPUT: ${{ vars.PERFORMANCE_TEST_DEBUG_OUTPUT }}
236238

237239
- name: send coveralls report
238240
run: |
@@ -249,11 +251,11 @@ jobs:
249251
name: 'Tests: Frontend'
250252
runs-on: ubuntu-latest
251253
steps:
252-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
254+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
253255

254256
- uses: actions/setup-node@v4
255257
with:
256-
node-version: '20.14.0'
258+
node-version: '22.3.0'
257259

258260
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
259261
with:
@@ -292,11 +294,11 @@ jobs:
292294
name: 'Tests: Print'
293295
runs-on: ubuntu-latest
294296
steps:
295-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
297+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
296298

297299
- uses: actions/setup-node@v4
298300
with:
299-
node-version: '20.14.0'
301+
node-version: '22.3.0'
300302

301303
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
302304
with:
@@ -331,11 +333,11 @@ jobs:
331333
name: 'Tests: PDF'
332334
runs-on: ubuntu-latest
333335
steps:
334-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
336+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
335337

336338
- uses: actions/setup-node@v4
337339
with:
338-
node-version: '20.14.0'
340+
node-version: '22.3.0'
339341

340342
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
341343
with:

‎.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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ 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:
@@ -68,3 +68,5 @@ jobs:
6868

6969
- run: composer performance_test
7070
working-directory: api
71+
env:
72+
PERFORMANCE_TEST_DEBUG_OUTPUT: ${{ vars.PERFORMANCE_TEST_DEBUG_OUTPUT }}

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

Lines changed: 4 additions & 17 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

@@ -58,26 +58,13 @@ jobs:
5858
push: true
5959
file: api/Dockerfile
6060
tags: |
61-
${{ ((inputs.tag != '') && format('{0}/ecamp3-api-php:{1}', vars.DOCKER_HUB_USERNAME, inputs.tag) || '') }}
62-
${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-api-php:${{ inputs.sha }}
61+
${{ ((inputs.tag != '') && format('{0}/ecamp3-api:{1}', vars.DOCKER_HUB_USERNAME, inputs.tag) || '') }}
62+
${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-api:${{ inputs.sha }}
6363
context: './api'
64-
target: api_platform_php
64+
target: frankenphp_prod
6565
cache-from: type=gha,scope=api
6666
cache-to: type=gha,scope=api,mode=max
6767

68-
- name: Build and push caddy docker image
69-
uses: docker/build-push-action@v5
70-
with:
71-
push: true
72-
file: api/Dockerfile
73-
tags: |
74-
${{ ((inputs.tag != '') && format('{0}/ecamp3-api-caddy:{1}', vars.DOCKER_HUB_USERNAME, inputs.tag) || '') }}
75-
${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-api-caddy:${{ inputs.sha }}
76-
context: './api'
77-
target: api_platform_caddy_prod
78-
cache-from: type=gha,scope=caddy
79-
cache-to: type=gha,scope=caddy,mode=max
80-
8168
- name: Build and push print docker image
8269
uses: docker/build-push-action@v5
8370
with:

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
name: ${{ inputs.env }}
3333
steps:
3434
- name: Get link to currently running job logs
35-
uses: Tiryoh/gha-jobid-action@v1.2.0
35+
uses: Tiryoh/gha-jobid-action@v1.3.0
3636
id: job-url
3737
with:
3838
github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -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

@@ -83,8 +83,7 @@ jobs:
8383
--set imageTag=${{ inputs.sha }} \
8484
--set frontend.image.repository='docker.io/${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-frontend' \
8585
--set print.image.repository='docker.io/${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-print' \
86-
--set php.image.repository='docker.io/${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-api-php' \
87-
--set caddy.image.repository='docker.io/${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-api-caddy' \
86+
--set api.image.repository='docker.io/${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-api' \
8887
--set apiCache.image.repository='docker.io/${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-varnish' \
8988
--set postgresql.dbBackupRestoreImage.repository='docker.io/${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-db-backup-restore' \
9089
--set termsOfServiceLinkTemplate='https://ecamp3.ch/{lang}/tos' \
@@ -112,12 +111,12 @@ jobs:
112111
--set postgresql.restore.s3.accessKeyId='${{ secrets.RESTORE_S3_ACCESS_KEY_ID }}' \
113112
--set postgresql.restore.s3.accessKey='${{ secrets.RESTORE_S3_ACCESS_KEY }}' \
114113
--set postgresql.restore.encryptionKey=${{ secrets.RESTORE_ENCRYPTION_KEY != null && format('''{0}''', secrets.RESTORE_ENCRYPTION_KEY) || null }} \
115-
--set php.dataMigrationsDir='${{ vars.DATA_MIGRATIONS_DIR }}' \
116-
--set php.appSecret='${{ secrets.API_APP_SECRET }}' \
117-
--set php.sentryDsn='${{ secrets.API_SENTRY_DSN }}' \
118-
--set php.jwt.passphrase='${{ secrets.JWT_PASSPHRASE }}' \
119-
--set php.jwt.publicKey='${{ secrets.JWT_PUBLIC_KEY }}' \
120-
--set php.jwt.privateKey='${{ secrets.JWT_PRIVATE_KEY }}' \
114+
--set api.dataMigrationsDir='${{ vars.DATA_MIGRATIONS_DIR }}' \
115+
--set api.appSecret='${{ secrets.API_APP_SECRET }}' \
116+
--set api.sentryDsn='${{ secrets.API_SENTRY_DSN }}' \
117+
--set api.jwt.passphrase='${{ secrets.JWT_PASSPHRASE }}' \
118+
--set api.jwt.publicKey='${{ secrets.JWT_PUBLIC_KEY }}' \
119+
--set api.jwt.privateKey='${{ secrets.JWT_PRIVATE_KEY }}' \
121120
--set frontend.sentryDsn='${{ secrets.FRONTEND_SENTRY_DSN }}' \
122121
--set print.sentryDsn='${{ secrets.PRINT_SENTRY_DSN }}' \
123122
--set print.browserWsEndpoint='${{ secrets.BROWSER_WS_ENDPOINT }}' \

0 commit comments

Comments
 (0)