Skip to content

Commit a4f6bb8

Browse files
ludovicm67ludovicm67
authored
Merge pull request #2510 from visualize-admin/ci-updates-2026-01-22
[2026-01-21] GitHub Actions updates
2 parents 877de2f + 974c1d3 commit a4f6bb8

File tree

11 files changed

+68
-71
lines changed

11 files changed

+68
-71
lines changed

.github/workflows/base-checks.yml renamed to .github/workflows/base-checks.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ name: Validate
22

33
on:
44
push:
5-
branches: [main]
5+
branches:
6+
- main
67
pull_request:
7-
branches: [main]
8+
branches:
9+
- main
810

911
jobs:
1012
base-checks:
@@ -14,11 +16,11 @@ jobs:
1416
matrix:
1517
job: [lint, typecheck, test, knip]
1618
steps:
17-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
1820
- name: Setup node
19-
uses: actions/setup-node@v4
21+
uses: actions/setup-node@v6
2022
with:
21-
node-version: 22.x
23+
node-version: "lts/*"
2224
cache: "yarn"
2325
cache-dependency-path: "**/yarn.lock"
2426
- run: yarn install --immutable --prefer-offline

.github/workflows/e2e.yml renamed to .github/workflows/e2e.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: E2E
22

3-
on: [deployment_status]
3+
on:
4+
- deployment_status
45

56
jobs:
67
e2e:
@@ -12,13 +13,13 @@ jobs:
1213
shardIndex: [1, 2, 3, 4]
1314
shardTotal: [4]
1415
steps:
15-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
1617
with:
1718
# fetch all commits so we can find the branch
1819
fetch-depth: 0
19-
- uses: actions/setup-node@v4
20+
- uses: actions/setup-node@v6
2021
with:
21-
node-version: 22.x
22+
node-version: "lts/*"
2223
cache: "yarn"
2324
cache-dependency-path: "**/yarn.lock"
2425
- name: Install dependencies
@@ -35,7 +36,7 @@ jobs:
3536
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3637
- name: Upload blob report to GitHub Actions Artifacts
3738
if: ${{ !cancelled() }}
38-
uses: actions/upload-artifact@v4
39+
uses: actions/upload-artifact@v6
3940
with:
4041
name: blob-report-${{ matrix.shardIndex }}
4142
path: blob-report

.github/workflows/gitlab-mirror.yml renamed to .github/workflows/gitlab-mirror.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
name: GitLab Mirror
22

3-
on: [push, delete]
3+
on:
4+
- push
5+
- delete
46

57
jobs:
68
to_gitlab:
79
runs-on: ubuntu-latest
810
steps:
911
- name: Checkout
10-
uses: actions/checkout@v4
12+
uses: actions/checkout@v6
1113
with:
1214
fetch-depth: 0
1315
- name: Logging

.github/workflows/manual-load-test.yml renamed to .github/workflows/manual-load-test.yaml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,25 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v6
3131

3232
- name: Testing GraphQL - Components
3333
if: always()
3434
uses: grafana/k6-action@v0.3.1
3535
with:
3636
filename: k6/load-tests/graphql/components.js
37-
flags:
38-
--env ENV=${{ env.ENV }} --env ENABLE_GQL_SERVER_SIDE_CACHE=${{
39-
env.ENABLE_GQL_SERVER_SIDE_CACHE }}
37+
flags: --env ENV=${{ env.ENV }} --env ENABLE_GQL_SERVER_SIDE_CACHE=${{ env.ENABLE_GQL_SERVER_SIDE_CACHE }}
4038

4139
- name: Testing GraphQL - Observations
4240
if: always()
4341
uses: grafana/k6-action@v0.3.1
4442
with:
4543
filename: k6/load-tests/graphql/observations.js
46-
flags:
47-
--env ENV=${{ env.ENV }} --env ENABLE_GQL_SERVER_SIDE_CACHE=${{
48-
env.ENABLE_GQL_SERVER_SIDE_CACHE }}
44+
flags: --env ENV=${{ env.ENV }} --env ENABLE_GQL_SERVER_SIDE_CACHE=${{ env.ENABLE_GQL_SERVER_SIDE_CACHE }}
4945

5046
- name: Testing HAR - Edition
5147
if: always()
5248
uses: grafana/k6-action@v0.3.1
5349
with:
5450
filename: k6/load-tests/har/${{ env.ENV }}/edition.js
55-
flags:
56-
--env ENABLE_GQL_SERVER_SIDE_CACHE=${{
57-
env.ENABLE_GQL_SERVER_SIDE_CACHE }}
51+
flags: --env ENABLE_GQL_SERVER_SIDE_CACHE=${{ env.ENABLE_GQL_SERVER_SIDE_CACHE }}

.github/workflows/performance-tests-pr.yml renamed to .github/workflows/performance-tests-pr.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
name: GraphQL performance tests (PR)
44

5-
on: [deployment_status]
5+
on:
6+
- deployment_status
67

78
env:
8-
SUMMARY: ''
9+
SUMMARY: ""
910

1011
jobs:
1112
run_tests:
@@ -14,16 +15,16 @@ jobs:
1415
runs-on: ubuntu-latest
1516
steps:
1617
- name: Check out
17-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1819
- name: Send an HTTP request to start up the server
1920
run: |
2021
curl -s '${{ github.event.deployment_status.target_url }}/api/graphql' -X 'POST' -H 'Content-Type: application/json' -d '{"operationName":"DataCubeObservations","variables":{"locale":"en","sourceType":"sparql","sourceUrl":"https://lindas.admin.ch/query","cubeFilter":{"iri":"https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/9","filters":{"https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/Kanton":{"type":"single","value":"https://ld.admin.ch/canton/1"}}}},"query":"query DataCubeObservations($sourceType: String!, $sourceUrl: DataSourceUrl!, $locale: String!, $cubeFilter: DataCubeObservationFilter!) { dataCubeObservations(sourceType: $sourceType, sourceUrl: $sourceUrl, locale: $locale, cubeFilter: $cubeFilter) }"}' > /dev/null
2122
- name: Download, unzip and install k6 binary
2223
run: |
23-
wget https://github.com/grafana/k6/releases/download/v0.49.0/k6-v0.49.0-linux-amd64.tar.gz
24-
tar -xzf k6-v0.49.0-linux-amd64.tar.gz
25-
sudo cp k6-v0.49.0-linux-amd64/k6 /usr/local/bin/k6
26-
export PATH=$PATH:/usr/local/bin
24+
wget https://github.com/grafana/k6/releases/download/v0.49.0/k6-v0.49.0-linux-amd64.tar.gz
25+
tar -xzf k6-v0.49.0-linux-amd64.tar.gz
26+
sudo cp k6-v0.49.0-linux-amd64/k6 /usr/local/bin/k6
27+
export PATH=$PATH:/usr/local/bin
2728
- name: Run k6 test (iteration 1)
2829
run: echo "SUMMARY=${{ env.SUMMARY }}$(k6 run --tag testid=DataCubeComponents --env ENV=PR --env ENDPOINT=${{ github.event.deployment_status.target_url }}/api/graphql --env CUBE_IRI=https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/9 --env CUBE_LABEL=Photovoltaikanlagen/9 --env CHECK_TIMING=true --env WORKSPACE=${{ github.workspace }} --quiet - <k6/performance-tests/graphql/DataCubeComponents.js)" >> $GITHUB_ENV
2930
- name: Run k6 test (iteration 2)

.github/workflows/performance-tests.yml renamed to .github/workflows/performance-tests.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Check out
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1717
- name: Download, unzip and install k6 binary
1818
run: |
19-
wget https://github.com/grafana/k6/releases/download/v0.49.0/k6-v0.49.0-linux-amd64.tar.gz
20-
tar -xzf k6-v0.49.0-linux-amd64.tar.gz
21-
sudo cp k6-v0.49.0-linux-amd64/k6 /usr/local/bin/k6
22-
export PATH=$PATH:/usr/local/bin
19+
wget https://github.com/grafana/k6/releases/download/v0.49.0/k6-v0.49.0-linux-amd64.tar.gz
20+
tar -xzf k6-v0.49.0-linux-amd64.tar.gz
21+
sudo cp k6-v0.49.0-linux-amd64/k6 /usr/local/bin/k6
22+
export PATH=$PATH:/usr/local/bin
2323
- name: Run k6 test (iteration 1)
2424
run: K6_PROMETHEUS_RW_USERNAME=${{ secrets.K6_PROMETHEUS_RW_USERNAME }} K6_PROMETHEUS_RW_PASSWORD=${{ secrets.K6_PROMETHEUS_RW_PASSWORD }} K6_PROMETHEUS_RW_SERVER_URL=${{ secrets.K6_PROMETHEUS_RW_SERVER_URL }} K6_PROMETHEUS_RW_TREND_STATS=avg k6 run -o experimental-prometheus-rw --tag testid=DataCubeComponents --env ENV=test --env ENDPOINT=https://test.visualize.admin.ch/api/graphql --env CUBE_IRI=https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/9 --env CUBE_LABEL=Photovoltaikanlagen/9 --env CHECK_TIMING=false --env WORKSPACE=${{ github.workspace }} --quiet - <k6/performance-tests/graphql/DataCubeComponents.js
2525
- name: Run k6 test (iteration 2)

.github/workflows/preload-varnish-cache.yml renamed to .github/workflows/preload-varnish-cache.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
preload-varnish-cache:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
13-
- uses: actions/setup-node@v4
12+
- uses: actions/checkout@v6
13+
- uses: actions/setup-node@v6
1414
with:
15-
node-version: 22.x
15+
node-version: "lts/*"
1616
cache: "yarn"
1717
cache-dependency-path: "**/yarn.lock"
1818
- name: Install dependencies

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Public documentation is available at https://visualize.admin.ch/docs/.
4040
## 2. <a name='DevelopmentEnvironment'></a>Development Environment
4141

4242
To start the development environment locally, you need a Postgres database.
43-
There's a [docker-compose.yml](./docker-compose.yml) for this if you have e.g.
43+
There's a [docker-compose.yaml](./docker-compose.yaml) for this if you have e.g.
4444
[Docker Desktop](https://www.docker.com/products/docker-desktop) installed.
4545

4646
In addition, you need to run a [Node.js](https://nodejs.org/) server on your

docker-compose.mitm.yml renamed to docker-compose.mitm.yaml

File renamed without changes.

docker-compose.yml renamed to docker-compose.yaml

File renamed without changes.

0 commit comments

Comments
 (0)