From c367b20f81726584a871fd1ac749bc1a10b42d58 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Wed, 8 May 2024 22:38:28 +0200 Subject: [PATCH 01/24] feat(backend): repackage Jar for arm builds --- .github/workflows/backend.yml | 40 ++++++++++++++++++++++------------- backend/Dockerfile | 11 ++++++++++ backend/build.gradle | 8 +++++++ 3 files changed, 44 insertions(+), 15 deletions(-) create mode 100644 backend/Dockerfile diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 0df546347c..1d182694bd 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -3,6 +3,16 @@ name: backend on: push: workflow_dispatch: + inputs: + build_arm: + type: boolean + description: "Build for ARM as well" + default: false + required: false + +env: + DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-backend @@ -26,7 +36,7 @@ jobs: id: files-hash run: | DIR_HASH=$(echo -n ${{ hashFiles('backend/**', '.github/workflows/backend.yml') }}) - echo "DIR_HASH=$DIR_HASH" >> $GITHUB_ENV + echo "DIR_HASH=$DIR_HASH${{ env.BUILD_ARM && '-arm'|| '' }}" >> $GITHUB_ENV - name: Setup Docker metadata id: dockerMetadata @@ -52,6 +62,9 @@ jobs: EXISTS=$(docker manifest inspect ${{ env.DOCKER_IMAGE_NAME }}:${{ env.DIR_HASH }} > /dev/null 2>&1 && echo "true" || echo "false") echo "CACHE_HIT=$EXISTS" >> $GITHUB_ENV + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Set up JDK if: env.CACHE_HIT == 'false' uses: actions/setup-java@v4 @@ -63,22 +76,19 @@ jobs: if: env.CACHE_HIT == 'false' uses: gradle/actions/setup-gradle@v3 - - name: Build Docker Image For Branch - if: env.CACHE_HIT == 'false' - run: ./gradlew bootBuildImage --imageName=${{ env.DOCKER_IMAGE_NAME }}:${{ env.DIR_HASH }} - working-directory: ./backend - env: - USER: ${{ github.actor }} - TOKEN: "${{ secrets.GITHUB_TOKEN }}" - - - name: Push Docker Image + - name: Build and push image if input files changed if: env.CACHE_HIT == 'false' - run: docker push ${{ env.DOCKER_IMAGE_NAME }}:${{ env.DIR_HASH }} - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/build-push-action@v5 + with: + context: ./backend + push: true + tags: ${{ steps.dockerMetadata.outputs.tags }} + cache-from: type=gha,scope=backend-${{ github.ref }} + cache-to: type=gha,mode=max,scope=backend-${{ github.ref }} + platforms: ${{ env.BUILD_ARM && 'linux/amd64,linux/arm64' || 'linux/amd64' }} - - name: Tag and push existing images + - name: Retag and push existing image if cache hit + if: env.CACHE_HIT == 'true' run: | TAGS=(${{ steps.dockerMetadata.outputs.tags }}) for TAG in "${TAGS[@]}"; do diff --git a/backend/Dockerfile b/backend/Dockerfile new file mode 100644 index 0000000000..38abedc62b --- /dev/null +++ b/backend/Dockerfile @@ -0,0 +1,11 @@ +FROM eclipse-temurin:21-jre-alpine + +WORKDIR /app + +COPY build/libs/backend.jar app.jar + +# Expose the port your application uses +EXPOSE 8080 + +# Command to run your jar +ENTRYPOINT ["java", "-jar", "app.jar", "--spring.profiles.active=docker"] diff --git a/backend/build.gradle b/backend/build.gradle index c8a1124ade..bb24dcb3cd 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -79,3 +79,11 @@ tasks.named('bootBuildImage') { // https://paketo.io/docs/howto/configuration/ environment["BPE_SPRING_PROFILES_ACTIVE"] = "docker" } + +tasks.named("jar") { + enabled = false // prevent to generate plain jar +} +tasks.named("bootJar") { + enabled = true + archiveVersion.set("") +} From a8680560bf476b782a8cf0040c6ed325e30e7c64 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Wed, 8 May 2024 22:40:54 +0200 Subject: [PATCH 02/24] Expose right port --- backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 38abedc62b..e1ebaa37ca 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app COPY build/libs/backend.jar app.jar # Expose the port your application uses -EXPOSE 8080 +EXPOSE 8079 # Command to run your jar ENTRYPOINT ["java", "-jar", "app.jar", "--spring.profiles.active=docker"] From f1cbf9cb8122ae1d704018a0f7c263eac5964587 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Wed, 8 May 2024 22:43:48 +0200 Subject: [PATCH 03/24] Build --- .github/workflows/backend.yml | 5 +++++ backend/Dockerfile | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 1d182694bd..26a85c3dd3 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -76,6 +76,11 @@ jobs: if: env.CACHE_HIT == 'false' uses: gradle/actions/setup-gradle@v3 + - name: Build Backend + if: env.CACHE_HIT == 'false' + working-directory: ./backend + run: ./gradlew bootJar + - name: Build and push image if input files changed if: env.CACHE_HIT == 'false' uses: docker/build-push-action@v5 diff --git a/backend/Dockerfile b/backend/Dockerfile index e1ebaa37ca..b8615139ea 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -4,8 +4,6 @@ WORKDIR /app COPY build/libs/backend.jar app.jar -# Expose the port your application uses EXPOSE 8079 -# Command to run your jar ENTRYPOINT ["java", "-jar", "app.jar", "--spring.profiles.active=docker"] From 651fc5dd683cebf07579c44423cc8ce5355703e5 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Wed, 8 May 2024 20:04:25 +0200 Subject: [PATCH 04/24] Copy .env.docker (cherry picked from commit 5c299fdd8f2ffb5259aba5bc6e9349710675148a) --- website/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/Dockerfile b/website/Dockerfile index d42da7f46d..8fcd5e729c 100644 --- a/website/Dockerfile +++ b/website/Dockerfile @@ -20,6 +20,8 @@ FROM base AS runtime COPY --from=prod-deps /app/node_modules ./node_modules COPY --from=build /app/dist ./dist +COPY .env.docker .env + EXPOSE 3000 VOLUME /config VOLUME /log From 7212787bb2be13b460a6a1b683bf550dc90da337 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Wed, 8 May 2024 20:32:16 +0200 Subject: [PATCH 05/24] Use .env file during build (cherry picked from commit cd834b20116eed3b3e5ffe39a5b14b56fa031216) --- website/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/website/Dockerfile b/website/Dockerfile index 8fcd5e729c..d42da7f46d 100644 --- a/website/Dockerfile +++ b/website/Dockerfile @@ -20,8 +20,6 @@ FROM base AS runtime COPY --from=prod-deps /app/node_modules ./node_modules COPY --from=build /app/dist ./dist -COPY .env.docker .env - EXPOSE 3000 VOLUME /config VOLUME /log From c826b94b321291b7e15bc1b185273c159a256a9e Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Wed, 8 May 2024 23:02:18 +0200 Subject: [PATCH 06/24] Build everything for arm as well --- .github/workflows/backend.yml | 2 +- .github/workflows/config-preprocessor-build.yml | 2 +- .github/workflows/dummyPreprocessing.yml | 2 +- .github/workflows/ingest.yml | 2 +- .github/workflows/keycloakify-build.yml | 2 +- .github/workflows/preprocessing-nextclade.yml | 2 +- .github/workflows/website.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 26a85c3dd3..b83c7fa3de 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -12,7 +12,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} + BUILD_ARM: "true" concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-backend diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-build.yml index 9f395785c0..5c057a591a 100644 --- a/.github/workflows/config-preprocessor-build.yml +++ b/.github/workflows/config-preprocessor-build.yml @@ -12,7 +12,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/config-processor - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} # When to build for arm as well + BUILD_ARM: "true" defaults: run: diff --git a/.github/workflows/dummyPreprocessing.yml b/.github/workflows/dummyPreprocessing.yml index 8898dc0183..b8f311142f 100644 --- a/.github/workflows/dummyPreprocessing.yml +++ b/.github/workflows/dummyPreprocessing.yml @@ -12,7 +12,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-dummy - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} # When to build for arm as well + BUILD_ARM: "true" concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-dummy diff --git a/.github/workflows/ingest.yml b/.github/workflows/ingest.yml index c209408530..5dd0526fd5 100644 --- a/.github/workflows/ingest.yml +++ b/.github/workflows/ingest.yml @@ -11,7 +11,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/ingest - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} + BUILD_ARM: "true" concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-ingest diff --git a/.github/workflows/keycloakify-build.yml b/.github/workflows/keycloakify-build.yml index 114308cda7..fec94f3875 100644 --- a/.github/workflows/keycloakify-build.yml +++ b/.github/workflows/keycloakify-build.yml @@ -12,7 +12,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/keycloakify - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} # When to build for arm as well + BUILD_ARM: "true" concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-keycloak-build diff --git a/.github/workflows/preprocessing-nextclade.yml b/.github/workflows/preprocessing-nextclade.yml index 5297ecaf69..43e5f43678 100644 --- a/.github/workflows/preprocessing-nextclade.yml +++ b/.github/workflows/preprocessing-nextclade.yml @@ -12,7 +12,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-nextclade - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} + BUILD_ARM: "true" concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-nextclade diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index a961df002e..12e09089c6 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -12,7 +12,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/website - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} # When to build for arm as well + BUILD_ARM: "true" concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-website From ff2b50ed3b29b197134b4302f1145d56a56b4903 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Wed, 8 May 2024 23:29:56 +0200 Subject: [PATCH 07/24] chore(ci): use node version from `.nvmrc` --- docs/.nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/.nvmrc b/docs/.nvmrc index 92f279e3e6..53d1c14db3 100644 --- a/docs/.nvmrc +++ b/docs/.nvmrc @@ -1 +1 @@ -v22 \ No newline at end of file +v22 From b6be3d918848b142b7c9ec716ec91ad2815bed85 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 15:59:11 +0200 Subject: [PATCH 08/24] Make a single launcher workflow to launch all arm builds --- .github/workflows/backend.yml | 7 +++ .github/workflows/build-arm.yaml | 46 +++++++++++++++++++ .../workflows/config-preprocessor-build.yml | 7 +++ .github/workflows/dummyPreprocessing.yml | 8 ++++ .github/workflows/ingest.yml | 7 +++ .github/workflows/keycloakify-build.yml | 8 +++- .github/workflows/preprocessing-nextclade.yml | 7 +++ .github/workflows/website.yml | 8 +++- 8 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/build-arm.yaml diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index b83c7fa3de..13df105d3f 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -9,6 +9,13 @@ on: description: "Build for ARM as well" default: false required: false + workflow_call: + inputs: + build_arm: + type: boolean + description: "Build for ARM as well" + default: false + required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend diff --git a/.github/workflows/build-arm.yaml b/.github/workflows/build-arm.yaml new file mode 100644 index 0000000000..ee56a84d15 --- /dev/null +++ b/.github/workflows/build-arm.yaml @@ -0,0 +1,46 @@ +# Trigger a build of all docker images including ARM images + +on: + workflow_dispatch: + inputs: + build_arm: + type: boolean + description: "Build for ARM as well" + default: true + required: false + +jobs: + trigger-backend: + uses: ./.github/workflows/backend.yml + with: + build_arm: ${{ github.event.inputs.build_arm }} + + trigger-config-preprocessor: + uses: ./.github/workflows/config-preprocessor-build.yml + with: + build_arm: ${{ github.event.inputs.build_arm }} + + trigger-dummy-preprocessing: + uses: ./.github/workflows/dummyPreprocessing.yml + with: + build_arm: ${{ github.event.inputs.build_arm }} + + trigger-ingest: + uses: ./.github/workflows/ingest.yml + with: + build_arm: ${{ github.event.inputs.build_arm }} + + trigger-keycloakify: + uses: ./.github/workflows/keycloakify-build.yml + with: + build_arm: ${{ github.event.inputs.build_arm }} + + trigger-preprocessing-nextclade: + uses: ./.github/workflows/preprocessing-nextclade.yml + with: + build_arm: ${{ github.event.inputs.build_arm }} + + trigger-website: + uses: ./.github/workflows/website.yml + with: + build_arm: ${{ github.event.inputs.build_arm }} diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-build.yml index 5c057a591a..e230a1376e 100644 --- a/.github/workflows/config-preprocessor-build.yml +++ b/.github/workflows/config-preprocessor-build.yml @@ -9,6 +9,13 @@ on: description: "Build for ARM as well" default: false required: false + workflow_call: + inputs: + build_arm: + type: boolean + description: "Build for ARM as well" + default: false + required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/config-processor diff --git a/.github/workflows/dummyPreprocessing.yml b/.github/workflows/dummyPreprocessing.yml index b8f311142f..b3847be14d 100644 --- a/.github/workflows/dummyPreprocessing.yml +++ b/.github/workflows/dummyPreprocessing.yml @@ -9,6 +9,14 @@ on: description: "Build for ARM as well" default: false required: false + workflow_call: + inputs: + build_arm: + type: boolean + description: "Build for ARM as well" + default: false + required: false + env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-dummy diff --git a/.github/workflows/ingest.yml b/.github/workflows/ingest.yml index 5dd0526fd5..260ecd4d62 100644 --- a/.github/workflows/ingest.yml +++ b/.github/workflows/ingest.yml @@ -8,6 +8,13 @@ on: description: "Build for ARM as well" default: false required: false + workflow_call: + inputs: + build_arm: + type: boolean + description: "Build for ARM as well" + default: false + required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/ingest diff --git a/.github/workflows/keycloakify-build.yml b/.github/workflows/keycloakify-build.yml index fec94f3875..d66a97beda 100644 --- a/.github/workflows/keycloakify-build.yml +++ b/.github/workflows/keycloakify-build.yml @@ -9,7 +9,13 @@ on: description: "Build for ARM as well" default: false required: false - + workflow_call: + inputs: + build_arm: + type: boolean + description: "Build for ARM as well" + default: false + required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/keycloakify BUILD_ARM: "true" diff --git a/.github/workflows/preprocessing-nextclade.yml b/.github/workflows/preprocessing-nextclade.yml index 43e5f43678..e3ab6b3a3b 100644 --- a/.github/workflows/preprocessing-nextclade.yml +++ b/.github/workflows/preprocessing-nextclade.yml @@ -9,6 +9,13 @@ on: description: "Build for ARM as well" default: false required: false + workflow_call: + inputs: + build_arm: + type: boolean + description: "Build for ARM as well" + default: false + required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-nextclade diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 12e09089c6..0a0cd8712e 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -9,7 +9,13 @@ on: description: "Build for ARM as well" default: false required: false - + workflow_call: + inputs: + build_arm: + type: boolean + description: "Build for ARM as well" + default: false + required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/website BUILD_ARM: "true" From be36616d46368a0d0f1442a43c1a6eb2e245017c Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 16:04:56 +0200 Subject: [PATCH 09/24] trigger on push temporarily for testing --- .github/workflows/build-arm.yaml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-arm.yaml b/.github/workflows/build-arm.yaml index ee56a84d15..293df550da 100644 --- a/.github/workflows/build-arm.yaml +++ b/.github/workflows/build-arm.yaml @@ -1,6 +1,7 @@ # Trigger a build of all docker images including ARM images on: + push: workflow_dispatch: inputs: build_arm: @@ -9,38 +10,41 @@ on: default: true required: false +env: + BUILD_ARM: ${{ github.event.inputs.build_arm || 'true' }} + jobs: trigger-backend: uses: ./.github/workflows/backend.yml with: - build_arm: ${{ github.event.inputs.build_arm }} + build_arm: ${{ github.env.BUILD_ARM }} trigger-config-preprocessor: uses: ./.github/workflows/config-preprocessor-build.yml with: - build_arm: ${{ github.event.inputs.build_arm }} + build_arm: ${{ github.env.BUILD_ARM }} trigger-dummy-preprocessing: uses: ./.github/workflows/dummyPreprocessing.yml with: - build_arm: ${{ github.event.inputs.build_arm }} + build_arm: ${{ github.env.BUILD_ARM }} trigger-ingest: uses: ./.github/workflows/ingest.yml with: - build_arm: ${{ github.event.inputs.build_arm }} + build_arm: ${{ github.env.BUILD_ARM }} trigger-keycloakify: uses: ./.github/workflows/keycloakify-build.yml with: - build_arm: ${{ github.event.inputs.build_arm }} + build_arm: ${{ github.env.BUILD_ARM }} trigger-preprocessing-nextclade: uses: ./.github/workflows/preprocessing-nextclade.yml with: - build_arm: ${{ github.event.inputs.build_arm }} + build_arm: ${{ github.env.BUILD_ARM }} trigger-website: uses: ./.github/workflows/website.yml with: - build_arm: ${{ github.event.inputs.build_arm }} + build_arm: ${{ github.env.BUILD_ARM }} From eb790801ddddc36632bd3c93d6edfa844abc1296 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 16:05:53 +0200 Subject: [PATCH 10/24] f --- .github/workflows/build-arm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-arm.yaml b/.github/workflows/build-arm.yaml index 293df550da..9a56bf37b8 100644 --- a/.github/workflows/build-arm.yaml +++ b/.github/workflows/build-arm.yaml @@ -11,7 +11,7 @@ on: required: false env: - BUILD_ARM: ${{ github.event.inputs.build_arm || 'true' }} + BUILD_ARM: "true" jobs: trigger-backend: From 1479e938d0969d9c7e754d5e9a9bce6e97ffa9f8 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 16:09:04 +0200 Subject: [PATCH 11/24] give broad permissions --- .github/workflows/build-arm.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build-arm.yaml b/.github/workflows/build-arm.yaml index 9a56bf37b8..90116c67ad 100644 --- a/.github/workflows/build-arm.yaml +++ b/.github/workflows/build-arm.yaml @@ -13,6 +13,11 @@ on: env: BUILD_ARM: "true" +permissions: + contents: read + packages: write + checks: read + jobs: trigger-backend: uses: ./.github/workflows/backend.yml From 561a66e7aa0f79523bbb358ad19d1e5523b6589b Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 16:15:46 +0200 Subject: [PATCH 12/24] try again --- .github/workflows/build-arm.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-arm.yaml b/.github/workflows/build-arm.yaml index 90116c67ad..8deba3564d 100644 --- a/.github/workflows/build-arm.yaml +++ b/.github/workflows/build-arm.yaml @@ -11,7 +11,7 @@ on: required: false env: - BUILD_ARM: "true" + BUILD_ARM: true permissions: contents: read @@ -22,34 +22,34 @@ jobs: trigger-backend: uses: ./.github/workflows/backend.yml with: - build_arm: ${{ github.env.BUILD_ARM }} + build_arm: true trigger-config-preprocessor: uses: ./.github/workflows/config-preprocessor-build.yml with: - build_arm: ${{ github.env.BUILD_ARM }} + build_arm: true trigger-dummy-preprocessing: uses: ./.github/workflows/dummyPreprocessing.yml with: - build_arm: ${{ github.env.BUILD_ARM }} + build_arm: true trigger-ingest: uses: ./.github/workflows/ingest.yml with: - build_arm: ${{ github.env.BUILD_ARM }} + build_arm: true trigger-keycloakify: uses: ./.github/workflows/keycloakify-build.yml with: - build_arm: ${{ github.env.BUILD_ARM }} + build_arm: true trigger-preprocessing-nextclade: uses: ./.github/workflows/preprocessing-nextclade.yml with: - build_arm: ${{ github.env.BUILD_ARM }} + build_arm: true trigger-website: uses: ./.github/workflows/website.yml with: - build_arm: ${{ github.env.BUILD_ARM }} + build_arm: true From 10e6683688000ba48caf486ec68e8432444e3fa7 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 17:06:13 +0200 Subject: [PATCH 13/24] test --- .github/workflows/backend.yml | 2 +- .github/workflows/build-arm.yaml | 9 --------- .github/workflows/config-preprocessor-build.yml | 4 ++-- .github/workflows/dummyPreprocessing.yml | 5 ++--- .github/workflows/ingest.yml | 4 ++-- .github/workflows/keycloakify-build.yml | 4 ++-- .github/workflows/preprocessing-nextclade.yml | 4 ++-- .github/workflows/website.yml | 4 ++-- 8 files changed, 13 insertions(+), 23 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 13df105d3f..b4586e823c 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend - BUILD_ARM: "true" + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-backend diff --git a/.github/workflows/build-arm.yaml b/.github/workflows/build-arm.yaml index 8deba3564d..f582732c59 100644 --- a/.github/workflows/build-arm.yaml +++ b/.github/workflows/build-arm.yaml @@ -3,15 +3,6 @@ on: push: workflow_dispatch: - inputs: - build_arm: - type: boolean - description: "Build for ARM as well" - default: true - required: false - -env: - BUILD_ARM: true permissions: contents: read diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-build.yml index e230a1376e..eec8abd497 100644 --- a/.github/workflows/config-preprocessor-build.yml +++ b/.github/workflows/config-preprocessor-build.yml @@ -19,14 +19,14 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/config-processor - BUILD_ARM: "true" + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} defaults: run: working-directory: ./kubernetes/config-processor concurrency: - group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-config-processor + group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-config-processor-${{github.event.inputs.build_arm}} cancel-in-progress: true jobs: diff --git a/.github/workflows/dummyPreprocessing.yml b/.github/workflows/dummyPreprocessing.yml index b3847be14d..0f162b71a0 100644 --- a/.github/workflows/dummyPreprocessing.yml +++ b/.github/workflows/dummyPreprocessing.yml @@ -17,13 +17,12 @@ on: default: false required: false - env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-dummy - BUILD_ARM: "true" + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} concurrency: - group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-dummy + group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-dumm-${{github.event.inputs.build_arm}}y cancel-in-progress: true jobs: diff --git a/.github/workflows/ingest.yml b/.github/workflows/ingest.yml index 260ecd4d62..c1116de48b 100644 --- a/.github/workflows/ingest.yml +++ b/.github/workflows/ingest.yml @@ -18,10 +18,10 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/ingest - BUILD_ARM: "true" + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} concurrency: - group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-ingest + group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-ingest-${{github.event.inputs.build_arm}} cancel-in-progress: true jobs: diff --git a/.github/workflows/keycloakify-build.yml b/.github/workflows/keycloakify-build.yml index d66a97beda..158b70e973 100644 --- a/.github/workflows/keycloakify-build.yml +++ b/.github/workflows/keycloakify-build.yml @@ -18,10 +18,10 @@ on: required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/keycloakify - BUILD_ARM: "true" + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} concurrency: - group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-keycloak-build + group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-keycloak-buil-${{github.event.inputs.build_arm}}d cancel-in-progress: true jobs: diff --git a/.github/workflows/preprocessing-nextclade.yml b/.github/workflows/preprocessing-nextclade.yml index e3ab6b3a3b..f3b272ce35 100644 --- a/.github/workflows/preprocessing-nextclade.yml +++ b/.github/workflows/preprocessing-nextclade.yml @@ -19,10 +19,10 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-nextclade - BUILD_ARM: "true" + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} concurrency: - group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-nextclade + group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-nextclade-${{github.event.inputs.build_arm}} cancel-in-progress: true jobs: diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 0a0cd8712e..7bd913a57c 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -18,10 +18,10 @@ on: required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/website - BUILD_ARM: "true" + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} concurrency: - group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-website + group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-website-${{github.event.inputs.build_arm}} cancel-in-progress: true jobs: From 9bc037c32388493247fa5786b87df7c4c4e500bd Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 17:40:04 +0200 Subject: [PATCH 14/24] tag branch with arm --- .github/workflows/backend.yml | 1 + .github/workflows/config-preprocessor-build.yml | 1 + .github/workflows/dummyPreprocessing.yml | 1 + .github/workflows/ingest.yml | 1 + .github/workflows/keycloakify-build.yml | 1 + .github/workflows/preprocessing-nextclade.yml | 1 + .github/workflows/website.yml | 1 + 7 files changed, 7 insertions(+) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index b4586e823c..4f4f95ff82 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -55,6 +55,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- + type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} - name: Login to GitHub Container Registry uses: docker/login-action@v3 diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-build.yml index eec8abd497..9a43a2bd27 100644 --- a/.github/workflows/config-preprocessor-build.yml +++ b/.github/workflows/config-preprocessor-build.yml @@ -57,6 +57,7 @@ jobs: type=ref,event=branch type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=sha,prefix=commit- + type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} - name: Build and push image uses: docker/build-push-action@v5 with: diff --git a/.github/workflows/dummyPreprocessing.yml b/.github/workflows/dummyPreprocessing.yml index 0f162b71a0..a537b6dcd0 100644 --- a/.github/workflows/dummyPreprocessing.yml +++ b/.github/workflows/dummyPreprocessing.yml @@ -52,6 +52,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- + type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} - name: Login to GitHub Container Registry uses: docker/login-action@v3 diff --git a/.github/workflows/ingest.yml b/.github/workflows/ingest.yml index c1116de48b..b3449f3bce 100644 --- a/.github/workflows/ingest.yml +++ b/.github/workflows/ingest.yml @@ -52,6 +52,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- + type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} - name: Login to GitHub Container Registry uses: docker/login-action@v3 diff --git a/.github/workflows/keycloakify-build.yml b/.github/workflows/keycloakify-build.yml index 158b70e973..9f4eb03f69 100644 --- a/.github/workflows/keycloakify-build.yml +++ b/.github/workflows/keycloakify-build.yml @@ -56,6 +56,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- + type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} - name: Check if image exists id: check-image run: | diff --git a/.github/workflows/preprocessing-nextclade.yml b/.github/workflows/preprocessing-nextclade.yml index f3b272ce35..e4d3420a4c 100644 --- a/.github/workflows/preprocessing-nextclade.yml +++ b/.github/workflows/preprocessing-nextclade.yml @@ -53,6 +53,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- + type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} - name: Login to GitHub Container Registry uses: docker/login-action@v3 diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 7bd913a57c..906b767dd8 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -52,6 +52,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- + type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} - name: Login to GitHub Container Registry uses: docker/login-action@v3 From 777c4994d60582c71ec97eb984ae3262262cfd9e Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 18:03:37 +0200 Subject: [PATCH 15/24] try again --- .github/workflows/backend.yml | 11 +++++------ .github/workflows/config-preprocessor-build.yml | 8 ++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 4f4f95ff82..48532df98b 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -12,14 +12,14 @@ on: workflow_call: inputs: build_arm: - type: boolean + type: string description: "Build for ARM as well" - default: false - required: false + default: "false" + required: true env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true'}} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-backend @@ -55,8 +55,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- - type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} - + type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM == true || env.BUILD_ARM == 'true'}} - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-build.yml index 9a43a2bd27..c39823c175 100644 --- a/.github/workflows/config-preprocessor-build.yml +++ b/.github/workflows/config-preprocessor-build.yml @@ -8,14 +8,14 @@ on: type: boolean description: "Build for ARM as well" default: false - required: false + required: true workflow_call: inputs: build_arm: - type: boolean + type: string description: "Build for ARM as well" - default: false - required: false + default: "false" + required: true env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/config-processor From 00c99d77a56d14043ff29e95524c5e388e4f8d7b Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 18:07:10 +0200 Subject: [PATCH 16/24] fionally --- .github/workflows/backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 48532df98b..b844e35f9c 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true'}} + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true}} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-backend From 16ab0297f5388e296889e1850c5a69f00b031138 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 18:12:36 +0200 Subject: [PATCH 17/24] one more --- .github/workflows/backend.yml | 2 +- .github/workflows/config-preprocessor-build.yml | 2 +- .github/workflows/dummyPreprocessing.yml | 2 +- .github/workflows/ingest.yml | 2 +- .github/workflows/keycloakify-build.yml | 2 +- .github/workflows/preprocessing-nextclade.yml | 2 +- .github/workflows/website.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index b844e35f9c..b6273b7130 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true}} + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-backend diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-build.yml index c39823c175..ae218e2692 100644 --- a/.github/workflows/config-preprocessor-build.yml +++ b/.github/workflows/config-preprocessor-build.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/config-processor - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} defaults: run: diff --git a/.github/workflows/dummyPreprocessing.yml b/.github/workflows/dummyPreprocessing.yml index a537b6dcd0..1735d3b9a3 100644 --- a/.github/workflows/dummyPreprocessing.yml +++ b/.github/workflows/dummyPreprocessing.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-dummy - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} 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/ingest.yml b/.github/workflows/ingest.yml index b3449f3bce..a1d6cf057e 100644 --- a/.github/workflows/ingest.yml +++ b/.github/workflows/ingest.yml @@ -18,7 +18,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/ingest - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} 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-build.yml b/.github/workflows/keycloakify-build.yml index 9f4eb03f69..fc99dd249f 100644 --- a/.github/workflows/keycloakify-build.yml +++ b/.github/workflows/keycloakify-build.yml @@ -18,7 +18,7 @@ on: required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/keycloakify - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} 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-nextclade.yml b/.github/workflows/preprocessing-nextclade.yml index e4d3420a4c..b0296dd983 100644 --- a/.github/workflows/preprocessing-nextclade.yml +++ b/.github/workflows/preprocessing-nextclade.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-nextclade - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} 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.yml b/.github/workflows/website.yml index 906b767dd8..8ac6c59551 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -18,7 +18,7 @@ on: required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/website - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }} + BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-website-${{github.event.inputs.build_arm}} From 6a596901587feaef651c34a891d7ed8e28352ced Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 18:16:17 +0200 Subject: [PATCH 18/24] one more time --- .github/workflows/backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index b6273b7130..906b9fa629 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} + BUILD_ARM: ${{ github.event.inputs.build_arm && 'true' || 'false' }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-backend From ce79ac5842c49087607f75475e0e28656b49c9f3 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 18:20:49 +0200 Subject: [PATCH 19/24] I hope --- .github/workflows/backend.yml | 4 ++-- .github/workflows/config-preprocessor-build.yml | 2 +- .github/workflows/dummyPreprocessing.yml | 2 +- .github/workflows/ingest.yml | 2 +- .github/workflows/keycloakify-build.yml | 2 +- .github/workflows/preprocessing-nextclade.yml | 2 +- .github/workflows/website.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 906b9fa629..8ad91e7d97 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend - BUILD_ARM: ${{ github.event.inputs.build_arm && 'true' || 'false' }} + BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-backend @@ -55,7 +55,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- - type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM == true || env.BUILD_ARM == 'true'}} + type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-build.yml index ae218e2692..6965fbe12c 100644 --- a/.github/workflows/config-preprocessor-build.yml +++ b/.github/workflows/config-preprocessor-build.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/config-processor - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} + BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} defaults: run: diff --git a/.github/workflows/dummyPreprocessing.yml b/.github/workflows/dummyPreprocessing.yml index 1735d3b9a3..12906c665f 100644 --- a/.github/workflows/dummyPreprocessing.yml +++ b/.github/workflows/dummyPreprocessing.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-dummy - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} + BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} 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/ingest.yml b/.github/workflows/ingest.yml index a1d6cf057e..64f8f86395 100644 --- a/.github/workflows/ingest.yml +++ b/.github/workflows/ingest.yml @@ -18,7 +18,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/ingest - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} + BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} 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-build.yml b/.github/workflows/keycloakify-build.yml index fc99dd249f..f0aca3942e 100644 --- a/.github/workflows/keycloakify-build.yml +++ b/.github/workflows/keycloakify-build.yml @@ -18,7 +18,7 @@ on: required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/keycloakify - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} + BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} 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-nextclade.yml b/.github/workflows/preprocessing-nextclade.yml index b0296dd983..2bb0276813 100644 --- a/.github/workflows/preprocessing-nextclade.yml +++ b/.github/workflows/preprocessing-nextclade.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-nextclade - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} + BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} 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.yml b/.github/workflows/website.yml index 8ac6c59551..27e8575205 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -18,7 +18,7 @@ on: required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/website - BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm == 'true' || github.event.inputs.build_arm == true && 'true' || 'false' }} + BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-website-${{github.event.inputs.build_arm}} From 64a8c18afe837a88d6e2cea216159c1ee1ea3e0a Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 18:30:56 +0200 Subject: [PATCH 20/24] try this --- .github/workflows/backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 8ad91e7d97..51106f3edc 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -55,7 +55,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- - type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} + type=raw,value=${{ github.head_ref || github.ref_name }}-arm,enable=${{ env.BUILD_ARM }} - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: From 5bac577a7c43304944489eae7fe0182bb939195b Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 18:39:55 +0200 Subject: [PATCH 21/24] The stupidest thing eve: how should I've known that github.inputs.build_arm needs to be used for workflow call and not github.event.inputs.build_arm --- .github/workflows/backend.yml | 2 +- .github/workflows/config-preprocessor-build.yml | 2 +- .github/workflows/dummyPreprocessing.yml | 2 +- .github/workflows/ingest.yml | 2 +- .github/workflows/keycloakify-build.yml | 2 +- .github/workflows/preprocessing-nextclade.yml | 2 +- .github/workflows/website.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 51106f3edc..5e119b9fbd 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend - BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-backend diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-build.yml index 6965fbe12c..fd72ff03ef 100644 --- a/.github/workflows/config-preprocessor-build.yml +++ b/.github/workflows/config-preprocessor-build.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/config-processor - BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} defaults: run: diff --git a/.github/workflows/dummyPreprocessing.yml b/.github/workflows/dummyPreprocessing.yml index 12906c665f..f26c333ce5 100644 --- a/.github/workflows/dummyPreprocessing.yml +++ b/.github/workflows/dummyPreprocessing.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-dummy - BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} 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/ingest.yml b/.github/workflows/ingest.yml index 64f8f86395..a3a4989872 100644 --- a/.github/workflows/ingest.yml +++ b/.github/workflows/ingest.yml @@ -18,7 +18,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/ingest - BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} 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-build.yml b/.github/workflows/keycloakify-build.yml index f0aca3942e..5c8cfe9696 100644 --- a/.github/workflows/keycloakify-build.yml +++ b/.github/workflows/keycloakify-build.yml @@ -18,7 +18,7 @@ on: required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/keycloakify - BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} 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-nextclade.yml b/.github/workflows/preprocessing-nextclade.yml index 2bb0276813..209541d95e 100644 --- a/.github/workflows/preprocessing-nextclade.yml +++ b/.github/workflows/preprocessing-nextclade.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-nextclade - BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} 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.yml b/.github/workflows/website.yml index 27e8575205..4d695dfdee 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -18,7 +18,7 @@ on: required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/website - BUILD_ARM: ${{ (github.event.inputs.build_arm || github.ref == 'refs/heads/main') && 'true' || 'false' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-website-${{github.event.inputs.build_arm}} From 0a689491b14da089d44e1849fc5b3e6e2cf2e24e Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 18:44:49 +0200 Subject: [PATCH 22/24] Now --- .github/workflows/backend.yml | 3 ++- .github/workflows/config-preprocessor-build.yml | 3 ++- .github/workflows/dummyPreprocessing.yml | 3 ++- .github/workflows/ingest.yml | 3 ++- .github/workflows/keycloakify-build.yml | 3 ++- .github/workflows/preprocessing-nextclade.yml | 3 ++- .github/workflows/website.yml | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 5e119b9fbd..60e6a4cb6d 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -19,6 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} concurrency: @@ -55,7 +56,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- - type=raw,value=${{ github.head_ref || github.ref_name }}-arm,enable=${{ env.BUILD_ARM }} + type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }} - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-build.yml index fd72ff03ef..a34a1e2933 100644 --- a/.github/workflows/config-preprocessor-build.yml +++ b/.github/workflows/config-preprocessor-build.yml @@ -19,6 +19,7 @@ on: 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 || github.inputs.build_arm || github.ref == 'refs/heads/main' }} defaults: @@ -57,7 +58,7 @@ jobs: type=ref,event=branch type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=sha,prefix=commit- - type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} + type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }} - name: Build and push image uses: docker/build-push-action@v5 with: diff --git a/.github/workflows/dummyPreprocessing.yml b/.github/workflows/dummyPreprocessing.yml index f26c333ce5..22d8ac9079 100644 --- a/.github/workflows/dummyPreprocessing.yml +++ b/.github/workflows/dummyPreprocessing.yml @@ -19,6 +19,7 @@ on: 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 || github.inputs.build_arm || github.ref == 'refs/heads/main' }} concurrency: @@ -52,7 +53,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- - type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} + type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }} - name: Login to GitHub Container Registry uses: docker/login-action@v3 diff --git a/.github/workflows/ingest.yml b/.github/workflows/ingest.yml index a3a4989872..0e6ed8079a 100644 --- a/.github/workflows/ingest.yml +++ b/.github/workflows/ingest.yml @@ -18,6 +18,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/ingest + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} concurrency: @@ -52,7 +53,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- - type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} + type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }} - name: Login to GitHub Container Registry uses: docker/login-action@v3 diff --git a/.github/workflows/keycloakify-build.yml b/.github/workflows/keycloakify-build.yml index 5c8cfe9696..c4d37a92c1 100644 --- a/.github/workflows/keycloakify-build.yml +++ b/.github/workflows/keycloakify-build.yml @@ -18,6 +18,7 @@ on: required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/keycloakify + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} concurrency: @@ -56,7 +57,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- - type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} + type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }} - name: Check if image exists id: check-image run: | diff --git a/.github/workflows/preprocessing-nextclade.yml b/.github/workflows/preprocessing-nextclade.yml index 209541d95e..ace03aba9a 100644 --- a/.github/workflows/preprocessing-nextclade.yml +++ b/.github/workflows/preprocessing-nextclade.yml @@ -19,6 +19,7 @@ on: 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 || github.inputs.build_arm || github.ref == 'refs/heads/main' }} concurrency: @@ -53,7 +54,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- - type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} + type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }} - name: Login to GitHub Container Registry uses: docker/login-action@v3 diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 4d695dfdee..d868a3f988 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -18,6 +18,7 @@ on: required: false env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/website + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} concurrency: @@ -52,7 +53,7 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=branch type=sha,prefix=commit- - type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }} + type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }} - name: Login to GitHub Container Registry uses: docker/login-action@v3 From 9d721f75598d495239999d16c9bd2c95451b1194 Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 18:47:25 +0200 Subject: [PATCH 23/24] nowwww --- .github/workflows/backend.yml | 2 +- .github/workflows/config-preprocessor-build.yml | 2 +- .github/workflows/dummyPreprocessing.yml | 2 +- .github/workflows/ingest.yml | 2 +- .github/workflows/keycloakify-build.yml | 2 +- .github/workflows/preprocessing-nextclade.yml | 2 +- .github/workflows/website.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 60e6a4cb6d..c89bee73df 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -20,7 +20,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-backend diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-build.yml index a34a1e2933..4f81380d79 100644 --- a/.github/workflows/config-preprocessor-build.yml +++ b/.github/workflows/config-preprocessor-build.yml @@ -20,7 +20,7 @@ on: 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 || github.inputs.build_arm || github.ref == 'refs/heads/main' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} defaults: run: diff --git a/.github/workflows/dummyPreprocessing.yml b/.github/workflows/dummyPreprocessing.yml index 22d8ac9079..f9a16d419c 100644 --- a/.github/workflows/dummyPreprocessing.yml +++ b/.github/workflows/dummyPreprocessing.yml @@ -20,7 +20,7 @@ on: 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 || github.inputs.build_arm || github.ref == 'refs/heads/main' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} 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/ingest.yml b/.github/workflows/ingest.yml index 0e6ed8079a..3c7832b043 100644 --- a/.github/workflows/ingest.yml +++ b/.github/workflows/ingest.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/ingest BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} 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-build.yml b/.github/workflows/keycloakify-build.yml index c4d37a92c1..56506a57c2 100644 --- a/.github/workflows/keycloakify-build.yml +++ b/.github/workflows/keycloakify-build.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/keycloakify BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} 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-nextclade.yml b/.github/workflows/preprocessing-nextclade.yml index ace03aba9a..922c5a5b2b 100644 --- a/.github/workflows/preprocessing-nextclade.yml +++ b/.github/workflows/preprocessing-nextclade.yml @@ -20,7 +20,7 @@ on: 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 || github.inputs.build_arm || github.ref == 'refs/heads/main' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} 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.yml b/.github/workflows/website.yml index d868a3f988..7ed531b9a1 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -19,7 +19,7 @@ on: env: DOCKER_IMAGE_NAME: ghcr.io/loculus-project/website BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - BUILD_ARM: ${{ github.event.inputs.build_arm || github.inputs.build_arm || github.ref == 'refs/heads/main' }} + BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }} concurrency: group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-website-${{github.event.inputs.build_arm}} From 92d57f678027128e1fea890577fb62930f742cfe Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sat, 11 May 2024 18:50:26 +0200 Subject: [PATCH 24/24] Disable debug, finally! --- .github/workflows/website.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 7ed531b9a1..a963d5fa13 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -1,7 +1,6 @@ name: website on: - push: workflow_dispatch: inputs: build_arm: