From e612de011758a4f540b8ab708cbacd7f563f6aa0 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Mon, 13 May 2024 02:49:48 +0200 Subject: [PATCH] now... --- .github/workflows/backend-image.yml | 2 +- .github/workflows/config-preprocessor-image.yml | 2 +- .github/workflows/e2e-k3d.yml | 2 +- .github/workflows/ingest-image.yml | 2 +- .github/workflows/keycloakify-image.yml | 2 +- .github/workflows/preprocessing-dummy-image.yml | 2 +- .github/workflows/preprocessing-nextclade-image.yml | 2 +- .github/workflows/website-image.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/backend-image.yml b/.github/workflows/backend-image.yml index 99220a7300..afc757e714 100644 --- a/.github/workflows/backend-image.yml +++ b/.github/workflows/backend-image.yml @@ -24,7 +24,7 @@ env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} - sha: ${{ github.head_ref || github.sha }} + sha: ${{ github.event.pull_request.base.sha || github.sha }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-backend diff --git a/.github/workflows/config-preprocessor-image.yml b/.github/workflows/config-preprocessor-image.yml index a82de75af0..1d5dcf338e 100644 --- a/.github/workflows/config-preprocessor-image.yml +++ b/.github/workflows/config-preprocessor-image.yml @@ -24,7 +24,7 @@ env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/config-processor BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} - sha: ${{ github.head_ref || github.sha }} + sha: ${{ github.event.pull_request.base.sha || github.sha }} defaults: run: diff --git a/.github/workflows/e2e-k3d.yml b/.github/workflows/e2e-k3d.yml index 3ad89c2c8b..57c00b59b3 100644 --- a/.github/workflows/e2e-k3d.yml +++ b/.github/workflows/e2e-k3d.yml @@ -38,7 +38,7 @@ jobs: env: ALL_BROWSERS: ${{ github.ref == 'refs/heads/main' || github.event.inputs.all_browsers && 'true' || 'false' }} - sha: ${{ github.head_ref || github.sha }} + sha: ${{ github.event.pull_request.base.sha || github.sha }} steps: - name: Collect Workflow Telemetry diff --git a/.github/workflows/ingest-image.yml b/.github/workflows/ingest-image.yml index 01ddddbe80..236b5c6553 100644 --- a/.github/workflows/ingest-image.yml +++ b/.github/workflows/ingest-image.yml @@ -23,7 +23,7 @@ env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/ingest BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} - sha: ${{ github.head_ref || github.sha }} + sha: ${{ github.event.pull_request.base.sha || github.sha }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-ingest-${{github.event.inputs.build_arm}} diff --git a/.github/workflows/keycloakify-image.yml b/.github/workflows/keycloakify-image.yml index 95e21b040d..74eb65bdec 100644 --- a/.github/workflows/keycloakify-image.yml +++ b/.github/workflows/keycloakify-image.yml @@ -23,7 +23,7 @@ env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/keycloakify BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} - sha: ${{ github.head_ref || github.sha }} + sha: ${{ github.event.pull_request.base.sha || github.sha }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-keycloak-buil-${{github.event.inputs.build_arm}}d diff --git a/.github/workflows/preprocessing-dummy-image.yml b/.github/workflows/preprocessing-dummy-image.yml index f570188711..a92c275706 100644 --- a/.github/workflows/preprocessing-dummy-image.yml +++ b/.github/workflows/preprocessing-dummy-image.yml @@ -24,7 +24,7 @@ env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-dummy BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} - sha: ${{ github.head_ref || github.sha }} + sha: ${{ github.event.pull_request.base.sha || github.sha }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-dumm-${{github.event.inputs.build_arm}}y diff --git a/.github/workflows/preprocessing-nextclade-image.yml b/.github/workflows/preprocessing-nextclade-image.yml index ceeeb4f01e..23a72fdf2e 100644 --- a/.github/workflows/preprocessing-nextclade-image.yml +++ b/.github/workflows/preprocessing-nextclade-image.yml @@ -24,7 +24,7 @@ env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-nextclade BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} - sha: ${{ github.head_ref || github.sha }} + sha: ${{ github.event.pull_request.base.sha || github.sha }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-nextclade-${{github.event.inputs.build_arm}} diff --git a/.github/workflows/website-image.yml b/.github/workflows/website-image.yml index 861a7b3094..e3b64699ce 100644 --- a/.github/workflows/website-image.yml +++ b/.github/workflows/website-image.yml @@ -23,7 +23,7 @@ env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/website BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} - sha: ${{ github.head_ref || github.sha }} + sha: ${{ github.event.pull_request.base.sha || github.sha }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-website-${{github.event.inputs.build_arm}}