From 688064d07cfa301c0e3d4fcb9903c04fef31c29f Mon Sep 17 00:00:00 2001
From: sandhya1874 <sandhya.gandalwar@digital.justice.gov.uk>
Date: Tue, 8 Oct 2024 22:08:45 +0100
Subject: [PATCH] .

---
 .github/workflows/build_multiplatform_docker.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_multiplatform_docker.yml b/.github/workflows/build_multiplatform_docker.yml
index 13fde17..95b16cc 100644
--- a/.github/workflows/build_multiplatform_docker.yml
+++ b/.github/workflows/build_multiplatform_docker.yml
@@ -54,7 +54,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/build_docker@feat/HEAT-344-share-app-version-across-jobs
-        if: ${{ inputs.docker_registry  == 'ghcr.io' }}
+        if: ${{ ( inputs.docker_registry  == 'ghcr.io' ) && ( ! inputs.docker_multiplatform )}}
         with:
           repository_name: ${{ github.event.repository.name }}
           docker_registry: ${{ inputs.docker_registry }}
@@ -64,7 +64,7 @@ jobs:
           app_version: ${{ needs.create_app_version.outputs.version }}
 
       - uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/build_docker@feat/HEAT-344-share-app-version-across-jobs
-        if: ${{ inputs.docker_registry  == 'quay.io' }}
+        if: ${{ ( inputs.docker_registry  == 'quay.io' ) && ( ! inputs.docker_multiplatform )}}
         with:
           repository_name: ${{ github.event.repository.name }}
           docker_registry: ${{ inputs.docker_registry }}
@@ -77,14 +77,8 @@ jobs:
           git_head_ref: ${{ github.head_ref }}
           git_branch_ref: ${{ github.ref_name }}
 
-  multiplatform_docker_build:
-    name: Build multiplatform docker image
-    if: ${{ docker_multiplatform == true }}
-    needs: [ create_app_version ]
-    runs-on: ubuntu-latest
-    steps:
       - uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/build_multiplatform_docker@feat/HEAT-344-share-app-version-across-jobs
-        if: ${{ inputs.docker_registry  == 'ghcr.io' }}
+        if: ${{ ( inputs.docker_registry  == 'ghcr.io' ) && ( inputs.docker_multiplatform )}}
         with:
           repository_name: ${{ github.event.repository.name }}
           docker_registry: ${{ inputs.docker_registry }}
@@ -94,7 +88,7 @@ jobs:
           app_version: ${{ needs.create_app_version.outputs.version }}
 
       - uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/build_multiplatform_docker@feat/HEAT-344-share-app-version-across-jobs
-        if: ${{ inputs.docker_registry  == 'quay.io' }}
+        if: ${{ ( inputs.docker_registry  == 'quay.io' ) && ( inputs.docker_multiplatform )}}
         with:
           repository_name: ${{ github.event.repository.name }}
           docker_registry: ${{ inputs.docker_registry }}