fix: main base build cicd (#1843)

* fix main base build

* trigger rebuild base images

Author: MWClayson-NHS

.github/workflows/stage-3-build-images-devtest.yaml

@@ -121,6 +121,12 @@ jobs:
           PR_NUM_TAG="pr${PR_NUM}"
           SHORT_COMMIT_HASH=$(git rev-parse --short ${GITHUB_SHA})
 
+
+          if [ "${GITHUB_REF}" == 'refs/heads/main' ]; then
+              PR_NUM_TAG="main"
+          fi
+
+
           docker build -f Dockerfile.dotnet.base -t cohort-manager-dotnet-base:latest .
           docker tag cohort-manager-dotnet-base:latest "ghcr.io/nhsdigital/cohort-manager-dotnet-base:${PR_NUM_TAG}"
           docker tag cohort-manager-dotnet-base:latest "ghcr.io/nhsdigital/cohort-manager-dotnet-base:${SHORT_COMMIT_HASH}"
@@ -151,6 +157,11 @@ jobs:
           if [[ ${{steps.detect-base-image-changes.outputs.BASE_IMAGE_CHANGE}} == 'true' ]]; then
             IMAGE_TAG="${PR_NUM_TAG}"
           fi
+
+          if [ "${GITHUB_REF}" == 'refs/heads/main' ]; then
+              IMAGE_TAG="latest"
+          fi
+
           echo "Image Tag: ${IMAGE_TAG}"
 
           echo "DOTNET_BASE_IMAGE=ghcr.io/nhsdigital/cohort-manager-dotnet-base:${IMAGE_TAG}" >> "${GITHUB_OUTPUT}"

.github/workflows/stage-3-build-images.yaml

@@ -113,9 +113,16 @@ jobs:
         if: ${{ steps.detect-base-image-changes.outputs.BASE_IMAGE_CHANGE == 'true' || github.ref == 'refs/heads/main'  }}
         continue-on-error: false
         run: |
+
+          echo "The branch is: ${GITHUB_REF}"
+
           PR_NUM_TAG=$(echo "${GITHUB_REF}" | sed 's/refs\/pull\/\([0-9]*\)\/merge/\1/')
           SHORT_COMMIT_HASH=$(git rev-parse --short ${GITHUB_SHA})
 
+          if [ "${GITHUB_REF}" == 'refs/heads/main' ]; then
+              PR_NUM_TAG="main"
+          fi
+
           docker build -f Dockerfile.dotnet.base -t cohort-manager-dotnet-base:latest .
           docker tag cohort-manager-dotnet-base:latest "ghcr.io/nhsdigital/cohort-manager-dotnet-base:${PR_NUM_TAG}"
           docker tag cohort-manager-dotnet-base:latest "ghcr.io/nhsdigital/cohort-manager-dotnet-base:${SHORT_COMMIT_HASH}"
@@ -126,8 +133,10 @@ jobs:
 
           docker push "ghcr.io/nhsdigital/cohort-manager-dotnet-base:${PR_NUM_TAG}"
           docker push "ghcr.io/nhsdigital/cohort-manager-dotnet-base:${SHORT_COMMIT_HASH}"
+
           docker push "ghcr.io/nhsdigital/cohort-manager-function-base:${PR_NUM_TAG}"
           docker push "ghcr.io/nhsdigital/cohort-manager-function-base:${SHORT_COMMIT_HASH}"
+
           if [ "${GITHUB_REF}" == 'refs/heads/main' ]; then
               docker push "ghcr.io/nhsdigital/cohort-manager-dotnet-base:latest"
               docker push "ghcr.io/nhsdigital/cohort-manager-function-base:latest"
@@ -143,6 +152,11 @@ jobs:
           if [[ ${{steps.detect-base-image-changes.outputs.BASE_IMAGE_CHANGE}} == 'true' ]]; then
             IMAGE_TAG="${PR_NUM_TAG}"
           fi
+
+          if [ "${GITHUB_REF}" == 'refs/heads/main' ]; then
+              IMAGE_TAG="latest"
+          fi
+
           echo "Image Tag = ${IMAGE_TAG}"
 
           echo "DOTNET_BASE_IMAGE=ghcr.io/nhsdigital/cohort-manager-dotnet-base:${IMAGE_TAG}" >> "${GITHUB_OUTPUT}"

Directory.Packages.props

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <!-- Enable central package management,
     https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
+    <!--Trigger Rebuild -->
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>