From 0d073038dc40a65035fa66741427d2947b94dcd1 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Tue, 26 May 2026 17:21:02 +0200 Subject: [PATCH 1/7] Update ci-pipeline. --- .github/workflows/build_job.yml | 3 --- .github/workflows/test_job.yml | 40 ++++++++++++++++++++++----------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_job.yml b/.github/workflows/build_job.yml index 951cade0..65ac4576 100644 --- a/.github/workflows/build_job.yml +++ b/.github/workflows/build_job.yml @@ -20,9 +20,6 @@ on: - 'v*.*.*' jobs: - lint: - uses: ./.github/workflows/test_job.yml - build-and-push-image: runs-on: ubuntu-latest needs: lint diff --git a/.github/workflows/test_job.yml b/.github/workflows/test_job.yml index fd9528fb..033e5bae 100644 --- a/.github/workflows/test_job.yml +++ b/.github/workflows/test_job.yml @@ -4,6 +4,7 @@ run-name: ${{ github.actor }} is doing some smoke tests on: [push, pull_request, workflow_call] jobs: Smoke-tests: + runs-on: ubuntu-latest runs-on: ubuntu-latest defaults: run: @@ -15,7 +16,7 @@ jobs: submodules: recursive - name: Create conda env # https://github.com/marketplace/actions/setup-micromamba - uses: mamba-org/setup-micromamba@v1 + uses: mamba-org/setup-micromamba@v3 with: environment-name: freva-web environment-file: dev-env.yml @@ -32,17 +33,12 @@ jobs: - name: Run build checks for js and python smoke tests run: micromamba run -n freva-web make tests - multi-platform-build: + build-docker-image: runs-on: ubuntu-latest + if: github.event.pull_request.user.login != 'dependabot[bot]' permissions: contents: write packages: write - strategy: - matrix: - platform: - - linux/amd64 - - linux/arm64 - - linux/ppc64le steps: - name: Checkout uses: actions/checkout@v4 @@ -52,9 +48,6 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 @@ -63,7 +56,7 @@ jobs: npm install npm run build-production - - name: Build freva-web image for ${{ matrix.platform }} + - name: Build freva-web image for uses: docker/build-push-action@v4 with: context: . @@ -71,7 +64,28 @@ jobs: build-args: | VERSION=test BUNDLE_HOST_PATH=${{ github.workspace }} - platforms: ${{ matrix.platform }} push: false no-cache: true tags: freva-web:latest + + dependabot: + name: Merge PR by dependabot + runs-on: ubuntu-latest + needs: [tests, build-docker-image] + if: github.event.pull_request.user.login == 'dependabot[bot]' + steps: + - name: Dependabot metadata + id: metadata + uses: dependabot/fetch-metadata@v1 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + - name: Approve dependabot's PR + run: gh pr review --approve "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.TOKEN}} + - name: Auto-merge for dependabot's PR + run: gh pr merge --merge --auto "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.TOKEN}} From e041160b373066c23ac00ec0b6717e665cb36df3 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Tue, 26 May 2026 17:22:19 +0200 Subject: [PATCH 2/7] Fix typo. --- .github/workflows/test_job.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test_job.yml b/.github/workflows/test_job.yml index 033e5bae..1dc75ef5 100644 --- a/.github/workflows/test_job.yml +++ b/.github/workflows/test_job.yml @@ -4,7 +4,6 @@ run-name: ${{ github.actor }} is doing some smoke tests on: [push, pull_request, workflow_call] jobs: Smoke-tests: - runs-on: ubuntu-latest runs-on: ubuntu-latest defaults: run: From 8e324bc52cdb8b772fb45e1fd9d03e8b1cbb3671 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Tue, 26 May 2026 17:23:48 +0200 Subject: [PATCH 3/7] Fix typo. --- .github/workflows/test_job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_job.yml b/.github/workflows/test_job.yml index 1dc75ef5..efe29c46 100644 --- a/.github/workflows/test_job.yml +++ b/.github/workflows/test_job.yml @@ -70,7 +70,7 @@ jobs: dependabot: name: Merge PR by dependabot runs-on: ubuntu-latest - needs: [tests, build-docker-image] + needs: [Somoke-tests] if: github.event.pull_request.user.login == 'dependabot[bot]' steps: - name: Dependabot metadata From 3bde3c3eeb5de85a6d4091471c92a1a35faf0d69 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Tue, 26 May 2026 17:24:37 +0200 Subject: [PATCH 4/7] Fix typo. --- .github/workflows/test_job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_job.yml b/.github/workflows/test_job.yml index efe29c46..c506af5f 100644 --- a/.github/workflows/test_job.yml +++ b/.github/workflows/test_job.yml @@ -70,7 +70,7 @@ jobs: dependabot: name: Merge PR by dependabot runs-on: ubuntu-latest - needs: [Somoke-tests] + needs: [Smoke-tests] if: github.event.pull_request.user.login == 'dependabot[bot]' steps: - name: Dependabot metadata From d18535a01dabaa93e39fbc05ec5a76f868ca7e9e Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Tue, 26 May 2026 17:26:49 +0200 Subject: [PATCH 5/7] Fix typo. --- .github/workflows/build_job.yml | 2 +- .github/workflows/test_job.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_job.yml b/.github/workflows/build_job.yml index 65ac4576..4a365f41 100644 --- a/.github/workflows/build_job.yml +++ b/.github/workflows/build_job.yml @@ -129,7 +129,7 @@ jobs: bump-web-version: runs-on: ubuntu-latest - needs: [build-and-push-image, lint] + needs: [build-and-push-image] if: github.event_name != 'workflow_dispatch' permissions: contents: write diff --git a/.github/workflows/test_job.yml b/.github/workflows/test_job.yml index c506af5f..b688e311 100644 --- a/.github/workflows/test_job.yml +++ b/.github/workflows/test_job.yml @@ -20,7 +20,7 @@ jobs: environment-name: freva-web environment-file: dev-env.yml cache-environment: false - cache-downloads: false + ache-downloads: false init-shell: bash - name: Generate self signed certs run: > From cf6e906738704c5de70309ddfd81c8893bcfb6f5 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Tue, 26 May 2026 22:35:43 +0200 Subject: [PATCH 6/7] Fix typo. --- .github/workflows/build_job.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_job.yml b/.github/workflows/build_job.yml index 4a365f41..200fefaa 100644 --- a/.github/workflows/build_job.yml +++ b/.github/workflows/build_job.yml @@ -22,7 +22,6 @@ on: jobs: build-and-push-image: runs-on: ubuntu-latest - needs: lint permissions: contents: write packages: write From e73015006bdd9fddff39e984b3ce0d2b414b099d Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Tue, 26 May 2026 22:36:52 +0200 Subject: [PATCH 7/7] Fix typo. --- .github/workflows/test_job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_job.yml b/.github/workflows/test_job.yml index b688e311..c506af5f 100644 --- a/.github/workflows/test_job.yml +++ b/.github/workflows/test_job.yml @@ -20,7 +20,7 @@ jobs: environment-name: freva-web environment-file: dev-env.yml cache-environment: false - ache-downloads: false + cache-downloads: false init-shell: bash - name: Generate self signed certs run: >