I hope

loculus-project · May 11, 2024 · ce79ac5 · ce79ac5
1 parent 6a59690
commit ce79ac5
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}}