Fix race condition

- Ensure that deploy_application uses the same git ref and not 'next'
  which can change between image creation in the deploy.yml file

Author: TheOneFromNorway

.github/workflows/deploy-application.yml

@@ -47,8 +47,11 @@ on:
           (Git ref to deploy, for example, a tag, branch name or commit SHA. Will use workflow ref if not provided.)
         required: true
         type: string
+      app_version:
+        required: true
+        type: string
 
-permissions: {}
+permissions: { }
 
 env:
   environment: ${{ inputs.environment }}
@@ -58,15 +61,15 @@ env:
     || 'arn:aws:iam::393416225559:role/GithubDeployECSService' }}
   aws_account_id: ${{ inputs.environment == 'production' && '820242920762' || '393416225559' }}
   cluster_name: mavis-${{ inputs.environment }}
-  app_version: ${{ inputs.git_ref_to_deploy == '' && 'unknown' || inputs.git_ref_to_deploy }}
+  app_version: ${{ github.event_name == 'workflow_call' && inputs.app_version || (inputs.git_ref_to_deploy == '' && 'unknown' || inputs.git_ref_to_deploy) }}
 
 concurrency:
   group: deploy-application-${{ inputs.environment }}
 
 jobs:
   determine-git-sha:
     runs-on: ubuntu-latest
-    permissions: {}
+    permissions: { }
     outputs:
       git-sha: ${{ steps.get-git-sha.outputs.git-sha }}
     steps:
@@ -89,7 +92,7 @@ jobs:
   prepare-deployment:
     name: Prepare deployment
     runs-on: ubuntu-latest
-    needs: [determine-git-sha, build-and-push-image]
+    needs: [ determine-git-sha, build-and-push-image ]
     permissions:
       id-token: write
     strategy:
@@ -146,7 +149,7 @@ jobs:
   deploy-service:
     name: Deploy service
     runs-on: ubuntu-latest
-    needs: [prepare-deployment, approve-deployments]
+    needs: [ prepare-deployment, approve-deployments ]
     permissions:
       id-token: write
     strategy:

.github/workflows/deploy.yml

@@ -146,7 +146,7 @@ jobs:
     uses: ./.github/workflows/deploy-infrastructure.yml
     with:
       environment: ${{ inputs.environment }}
-      git_ref_to_deploy: ${{ inputs.git_ref_to_deploy || github.ref_name }}
+      git_ref_to_deploy: ${{ needs.determine-git-sha.outputs.git-sha }}
   deploy-application:
     permissions:
       id-token: write
@@ -156,4 +156,5 @@ jobs:
     with:
       environment: ${{ inputs.environment }}
       server_types: ${{ inputs.server_types }}
-      git_ref_to_deploy: ${{ inputs.git_ref_to_deploy || github.ref_name }}
+      git_ref_to_deploy: ${{ needs.determine-git-sha.outputs.git-sha }}
+      app_version: ${{ inputs.git_ref_to_deploy == '' && github.ref_name || inputs.git_ref_to_deploy }}