Skip to content

Commit 6709883

Browse files
usuusu
committed
merge devel
2 parents 74eabba + 57fcccb commit 6709883

File tree

495 files changed

+37705
-28771
lines changed

Some content is hidden

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

495 files changed

+37705
-28771
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.3.0 AS build-stage
2+
FROM node:22.11.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.3.0 AS production-stage
25+
FROM node:22.11.0 AS production-stage
2626
WORKDIR /app
2727

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

‎.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.5.0
1+
ARG VERSION=7.6.1
22

33
FROM varnish:${VERSION}
44

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

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

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

3333
- run: composer update --lock --no-interaction --no-plugins --no-scripts --prefer-dist

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

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

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

2828
- run: composer validate -n --no-check-all --no-check-publish --strict
@@ -32,20 +32,20 @@ jobs:
3232
name: 'Lint: API (psalm)'
3333
runs-on: ubuntu-latest
3434
steps:
35-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
35+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3636

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

4343
- name: Get Composer Cache Directory
4444
id: composer-cache
4545
run: 'echo "dir=$(composer config cache-files-dir)" | tr -d "\n" >> $GITHUB_OUTPUT'
4646
working-directory: api
4747

48-
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
48+
- uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
4949
with:
5050
path: ${{ steps.composer-cache.outputs.dir }}
5151
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -62,20 +62,20 @@ jobs:
6262
name: 'Lint: API (phpstan)'
6363
runs-on: ubuntu-latest
6464
steps:
65-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
65+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
6666

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

7373
- name: Get Composer Cache Directory
7474
id: composer-cache
7575
run: 'echo "dir=$(composer config cache-files-dir)" | tr -d "\n" >> $GITHUB_OUTPUT'
7676
working-directory: api
7777

78-
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
78+
- uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
7979
with:
8080
path: ${{ steps.composer-cache.outputs.dir }}
8181
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -92,7 +92,7 @@ jobs:
9292
name: 'API: validate migrations'
9393
runs-on: ubuntu-latest
9494
env:
95-
TEST_DATABASE_URL: postgresql://ecamp3:ecamp3@localhost:5432/ecamp3test?serverVersion=15&charset=utf8
95+
DATABASE_URL: postgresql://ecamp3:ecamp3@localhost:5432/ecamp3?serverVersion=15&charset=utf8
9696

9797
services:
9898
postgres:
@@ -110,20 +110,20 @@ jobs:
110110
--health-retries 5
111111
112112
steps:
113-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
113+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
114114

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

121121
- name: Get Composer Cache Directory
122122
id: composer-cache
123123
run: 'echo "dir=$(composer config cache-files-dir)" | tr -d "\n" >> $GITHUB_OUTPUT'
124124
working-directory: api
125125

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

0 commit comments

Comments
 (0)