Skip to content

Commit c10d591

Browse files
BacLucBacLuc
committed
Merge remote-tracking branch 'upstream/devel' into fork/usu/chore/doctrine-orm-3
# Conflicts: # api/composer.json # api/composer.lock
2 parents 95595fd + 3a2e474 commit c10d591

Some content is hidden

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

55 files changed

+5857
-4575
lines changed

‎.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:22.11.0 AS build-stage
2+
FROM node:22.12.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:22.11.0 AS production-stage
25+
FROM node:22.12.0 AS production-stage
2626
WORKDIR /app
2727

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

‎.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@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
48+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # 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@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
78+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # 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@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
126+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # 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@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
103+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # 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.11.0'
127+
node-version: '22.12.0'
128128

129-
- uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
129+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # 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.11.0'
156+
node-version: '22.12.0'
157157

158-
- uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
158+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # 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.11.0'
185+
node-version: '22.12.0'
186186

187-
- uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
187+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # 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.11.0'
217+
node-version: '22.12.0'
218218

219-
- uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
219+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # 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@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
277+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # 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.11.0'
356+
node-version: '22.12.0'
357357

358-
- uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
358+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # 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.11.0'
399+
node-version: '22.12.0'
400400

401-
- uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
401+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # 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.11.0'
438+
node-version: '22.12.0'
439439

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

‎.github/workflows/deploy-ecamp3-logging.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: Deploy ecamp3-logging
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
environment:
7+
description: 'Choose environment'
8+
type: environment
9+
required: true
10+
11+
jobs:
12+
deploy-ecamp3-logging:
13+
name: "Deploy ecamp3-logging"
14+
runs-on: ubuntu-latest
15+
environment: ${{ github.event.inputs.environment }}
16+
steps:
17+
- name: Validate environment
18+
uses: actions/github-script@v7
19+
with:
20+
script: |
21+
if (!"${{ github.event.inputs.environment }}".startsWith("ecamp3-logging")) {
22+
throw new Error("Environment must start with 'ecamp3-logging'");
23+
}
24+
25+
26+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
27+
28+
- name: Dump secrets to .env
29+
run: |
30+
echo '${{ toJSON(secrets) }}' | jq -r 'keys[] as $k | select(.[$k] |contains("\n") | not) | "\($k)=\"\(.[$k])\""' >> .env
31+
working-directory: .ops/ecamp3-logging
32+
33+
- name: Dump variables to .env
34+
run: |
35+
echo '${{ toJSON(vars) }}' | jq -r 'keys[] as $k | select(.[$k] |contains("\n") | not) | "\($k)=\"\(.[$k])\""' >> .env
36+
working-directory: .ops/ecamp3-logging
37+
38+
- name: Show .env for debugging
39+
run: echo "$(cat .env | sort)"
40+
working-directory: .ops/ecamp3-logging
41+
42+
- name: Setup helm
43+
run: |
44+
mkdir ~/.kube && echo '${{ secrets.KUBECONFIG }}' > ~/.kube/config && chmod go-r ~/.kube/config
45+
46+
- name: Add helm repositories
47+
run: |
48+
helm repo add fluent https://fluent.github.io/helm-charts
49+
helm repo update
50+
51+
- name: Diff deployment
52+
run: |
53+
./deploy.sh diff || true
54+
working-directory: .ops/ecamp3-logging
55+
56+
- name: Show values.out.yaml
57+
run: cat values.out.yaml
58+
working-directory: .ops/ecamp3-logging
59+
60+
- name: Deploy
61+
run: |
62+
./deploy.sh deploy
63+
working-directory: .ops/ecamp3-logging

‎.github/workflows/deploy-ops-dashboard.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Deploy ops-dashboard
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
environment:
7+
description: 'Choose environment'
8+
type: environment
9+
required: true
10+
11+
jobs:
12+
deploy-ops-dashboard:
13+
name: "Deploy ops-dashboard"
14+
runs-on: ubuntu-latest
15+
environment: ${{ github.event.inputs.environment }}
16+
steps:
17+
- name: Validate environment
18+
uses: actions/github-script@v7
19+
with:
20+
script: |
21+
if (!"${{ github.event.inputs.environment }}".startsWith("ops-dashboard")) {
22+
throw new Error("Environment must start with 'ops-dashboard'");
23+
}
24+
25+
26+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
27+
28+
- name: Dump secrets to .env
29+
run: |
30+
echo '${{ toJSON(secrets) }}' | jq -r 'keys[] as $k | select(.[$k] |contains("\n") | not) | "\($k)=\"\(.[$k])\""' >> .env
31+
working-directory: .ops/ops-dashboard
32+
33+
- name: Dump variables to .env
34+
run: |
35+
echo '${{ toJSON(vars) }}' | jq -r 'keys[] as $k | select(.[$k] |contains("\n") | not) | "\($k)=\"\(.[$k])\""' >> .env
36+
working-directory: .ops/ops-dashboard
37+
38+
- name: Show .env for debugging
39+
run: echo "$(cat .env | sort)"
40+
working-directory: .ops/ops-dashboard
41+
42+
- name: Setup helm
43+
run: |
44+
mkdir ~/.kube && echo '${{ secrets.KUBECONFIG }}' > ~/.kube/config && chmod go-r ~/.kube/config
45+
46+
- name: Add helm repositories
47+
run: |
48+
helm repo add oauth2-proxy https://oauth2-proxy.github.io/manifests
49+
helm repo add kubernetes-dashboard https://kubernetes.github.io/dashboard/
50+
helm repo update
51+
52+
- name: Diff deployment
53+
run: |
54+
./deploy.sh diff || true
55+
working-directory: .ops/ops-dashboard
56+
57+
- name: Show values.out.yaml
58+
run: cat values.out.yaml
59+
working-directory: .ops/ops-dashboard
60+
61+
- name: Deploy
62+
run: |
63+
./deploy.sh deploy
64+
working-directory: .ops/ops-dashboard

‎.github/workflows/pull-request-rules.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: No "Meeting Discuss" label
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: mheap/github-action-required-labels@d25134c992b943fb6ad00c25ea00eb5988c0a9dd # v5
16+
- uses: mheap/github-action-required-labels@388fd6af37b34cdfe5a23b37060e763217e58b03 # v5
1717
if: github.event_name == 'pull_request'
1818
with:
1919
mode: exactly

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: 'echo "dir=$(composer config cache-files-dir)" | tr -d "\n" >> $GITHUB_OUTPUT'
4343
working-directory: api
4444

45-
- uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
45+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
4646
with:
4747
path: ${{ steps.composer-cache.outputs.dir }}
4848
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

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

Lines changed: 1 addition & 1 deletion
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@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
45+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
4646
with:
4747
path: .cache
4848
key: docker-compose-${{ hashFiles('frontend/package-lock.json', 'print/package-lock.json', 'api/composer.lock') }}-${{ matrix.browser }}

‎.helm/ecamp3/files/hook_db_restore/.env-example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SOURCE_FILE=latest
22
APP_NAME=test-db-backup-job
33
DATABASE_URL=
44
#if you want to restore to your local database:
5-
#DATABASE_URL=postgresql://ecamp3:ecamp3@<your-ip>:5432/ecamp3dev
5+
#DATABASE_URL=postgresql://ecamp3:ecamp3@localhost:5432/ecamp3dev
66
ENCRYPTION_KEY=test
77
S3_ENDPOINT=https://s3.eu-west-3.amazonaws.com
88
S3_BUCKET=

‎.helm/ecamp3/files/hook_db_restore/README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,10 @@ It also contains a docker-compose.yml file to easily test the [restore-backup.sh
1616
```shell
1717
docker compose run --rm restore-backup
1818
```
19+
4. Maybe locally: change username and password of the support account
20+
That we don't need sharp credentials in the local performance testing.
21+
22+
```shell
23+
docker compose run --rm restore-backup sh update-support-email.sh
24+
```
25+

0 commit comments

Comments
 (0)