Skip to content

Commit 376457f

Browse files
usuusu
committed
merge devel
2 parents 7d45596 + 8f51c59 commit 376457f

File tree

203 files changed

+21161
-16970
lines changed

Some content is hidden

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

203 files changed

+21161
-16970
lines changed

‎.docker-hub/varnish/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG VERSION=7.6.1
1+
ARG VERSION=7.7.0
22

33
FROM varnish:${VERSION}
44

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

Lines changed: 0 additions & 18 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
run: 'echo "dir=$(composer config cache-files-dir)" | tr -d "\n" >> $GITHUB_OUTPUT'
4646
working-directory: api
4747

48-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
48+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
4949
with:
5050
path: ${{ steps.composer-cache.outputs.dir }}
5151
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -75,7 +75,7 @@ jobs:
7575
run: 'echo "dir=$(composer config cache-files-dir)" | tr -d "\n" >> $GITHUB_OUTPUT'
7676
working-directory: api
7777

78-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
78+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
7979
with:
8080
path: ${{ steps.composer-cache.outputs.dir }}
8181
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -123,7 +123,7 @@ jobs:
123123
run: 'echo "dir=$(composer config cache-files-dir)" | tr -d "\n" >> $GITHUB_OUTPUT'
124124
working-directory: api
125125

126-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
126+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
127127
with:
128128
path: ${{ steps.composer-cache.outputs.dir }}
129129
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
run: 'echo "dir=$(composer config cache-files-dir)" | tr -d "\n" >> $GITHUB_OUTPUT'
101101
working-directory: api
102102

103-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
103+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
104104
with:
105105
path: ${{ steps.composer-cache.outputs.dir }}
106106
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -124,9 +124,9 @@ jobs:
124124

125125
- uses: actions/setup-node@v4
126126
with:
127-
node-version: '22.13.1'
127+
node-version: '22.14.0'
128128

129-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
129+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
130130
with:
131131
path: ~/.npm
132132
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -153,9 +153,9 @@ jobs:
153153

154154
- uses: actions/setup-node@v4
155155
with:
156-
node-version: '22.13.1'
156+
node-version: '22.14.0'
157157

158-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
158+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
159159
with:
160160
path: ~/.npm
161161
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -182,9 +182,9 @@ jobs:
182182

183183
- uses: actions/setup-node@v4
184184
with:
185-
node-version: '22.13.1'
185+
node-version: '22.14.0'
186186

187-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
187+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
188188
with:
189189
path: ~/.npm
190190
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -214,9 +214,9 @@ jobs:
214214

215215
- uses: actions/setup-node@v4
216216
with:
217-
node-version: '22.13.1'
217+
node-version: '22.14.0'
218218

219-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
219+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
220220
with:
221221
path: ~/.npm
222222
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -274,7 +274,7 @@ jobs:
274274
run: 'echo "dir=$(composer config cache-files-dir)" | tr -d "\n" >> $GITHUB_OUTPUT'
275275
working-directory: api
276276

277-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
277+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
278278
with:
279279
path: ${{ steps.composer-cache.outputs.dir }}
280280
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -353,9 +353,9 @@ jobs:
353353

354354
- uses: actions/setup-node@v4
355355
with:
356-
node-version: '22.13.1'
356+
node-version: '22.14.0'
357357

358-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
358+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
359359
with:
360360
path: ~/.npm
361361
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -396,9 +396,9 @@ jobs:
396396

397397
- uses: actions/setup-node@v4
398398
with:
399-
node-version: '22.13.1'
399+
node-version: '22.14.0'
400400

401-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
401+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
402402
with:
403403
path: ~/.npm
404404
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -435,9 +435,9 @@ jobs:
435435

436436
- uses: actions/setup-node@v4
437437
with:
438-
node-version: '22.13.1'
438+
node-version: '22.14.0'
439439

440-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
440+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
441441
with:
442442
path: ~/.npm
443443
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
- name: Remove GitHub deployment
7777
uses: bobheadxi/[email protected]
7878
with:
79-
step: deactivate-env
79+
step: delete-env
8080
token: ${{ secrets.REPO_ACCESS_TOKEN }}
8181
env: ${{ matrix.deployment-name }}
8282

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

Lines changed: 0 additions & 72 deletions
This file was deleted.

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
docker image ls -a --digests
4343
4444
- name: Restore cache volumes (npm, composer)
45-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
45+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
4646
with:
4747
path: .cache
4848
key: docker-compose-${{ hashFiles('frontend/package-lock.json', 'print/package-lock.json', 'api/composer.lock') }}-${{ matrix.browser }}
@@ -64,10 +64,12 @@ jobs:
6464
- run: docker compose -f docker-compose.yml run --rm api migrate-database
6565

6666
# start necessary containers
67-
- run: docker compose -f docker-compose.yml up -d api frontend pdf print browserless database docker-host http-cache mail pg-admin reverse-proxy
67+
- run: docker compose -f docker-compose.yml up -d api frontend pdf print browserless database docker-host http-cache http-cache-logs mail pg-admin reverse-proxy
6868

6969
# pull cypress while container are starting up
7070
- run: docker compose pull e2e
71+
72+
- run: docker compose run --entrypoint="npm ci" --rm e2e
7173

7274
- run: sh -x wait-for-container-startup.sh
7375

‎.helm/ecamp3/files/db-backup-restore-image/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:12.9-slim
1+
FROM debian:12.10-slim
22

33
ENV DEBIAN_FRONTEND="noninteractive"
44
RUN apt-get update && \

‎.helm/ecamp3/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,12 +234,12 @@ apiCache:
234234
memory: 100Mi
235235
logging:
236236
enabled: true
237-
customOutput: '{ "received_at": "%t", "varnish_side": "%{Varnish:side}x", "method": "%m", "url": "%U", "query": "%q", "response_bytes": %b, "time_taken": %D, "status": %s, "handling": "%{Varnish:handling}x", "response_reason": "%{VSL:RespReason}x", "fetch_error": "%{VSL:FetchError}x" }'
237+
customOutput: '{ "received_at": "%t", "varnish_side": "%{Varnish:side}x", "method": "%m", "host": "%h", "url": "%U", "query": "%q", "response_bytes": %b, "time_taken": %D, "status": %s, "handling": "%{Varnish:handling}x", "response_reason": "%{VSL:RespReason}x", "fetch_error": "%{VSL:FetchError}x", "httpRequest": { "requestMethod": "%m", "requestUrl": "%{Host}i%U%q", "status": "%s" } }'
238238
customOutputJsonFormat: true
239239
# Timeout before returning error on initial VSM connection.
240240
# If set the VSM connection is retried every 0.5 seconds for this many seconds.
241241
# If zero the connection is attempted only once and will fail immediately if unsuccessful.
242-
# If set to "off", the connection will not fail, allowing the utility to start and wait indefinetely for the Varnish instance to appear.
242+
# If set to "off", the connection will not fail, allowing the utility to start and wait indefinitely for the Varnish instance to appear.
243243
# Defaults to "off" in this case.
244244
timeout: "off"
245245
resources:

‎.ops/aws-setup/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
aws-setup:
3-
image: pulumi/pulumi-nodejs:3.152.0
3+
image: pulumi/pulumi-nodejs:3.162.0
44
container_name: 'ecamp3-aws-setup'
55
volumes:
66
- ../../.prettierrc:/.prettierrc:delegated
@@ -13,7 +13,7 @@ services:
1313
- AWS_DEFAULT_REGION=eu-west-3
1414

1515
aws-cli:
16-
image: amazon/aws-cli:2.24.6
16+
image: amazon/aws-cli:2.26.0
1717
container_name: 'ecamp3-aws-cli'
1818
volumes:
1919
- ./.aws:/root/.aws:delegated

0 commit comments

Comments
 (0)