[ODS-6577] 'Publish to Docker Hub' gets executed even if 'InitDev Package' fails (#1196)

Author: axelmarquezh

.github/workflows/Docker Test.yml

@@ -29,8 +29,16 @@ env:
   PACKAGE_VERSION: "7.4"
 
 jobs:
+  assert-all-required-workflows-succeeded:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: ahmadnassri/action-workflow-run-wait@2aa3d9e1a12ecaaa9908e368eaf2123bb084323e #v1.4.4
+        with:
+            timeout: 1800000
+            delay: 10000
+
   docker-lint:
-    if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}
+    needs: assert-all-required-workflows-succeeded
     runs-on: ubuntu-24.04
     strategy:
       matrix:
@@ -57,6 +65,7 @@ jobs:
           dockerfile: Docker/${{ matrix.image }}/Dockerfile
 
   FindStandardAndExtensionVersions:
+    needs: assert-all-required-workflows-succeeded
     uses: Ed-Fi-Alliance-OSS/Ed-Fi-ODS/.github/workflows/Find Standard and Extension Versions.yml@874b608a0f3a14243e0035dd1222169fafcbe8d3
     with:
       calling_branch: ${{ github.head_ref || github.ref_name }}

.github/workflows/Publish to Azure Artifacts.yml

@@ -7,15 +7,6 @@ name: Publish to Azure Artifacts
 
 on:
   workflow_dispatch:
-    inputs:
-      timeout:
-        description: "Timeout before we stop trying (in milliseconds) for action-workflow-run-wait step"
-        required: true
-        default: '1800000'
-      delay:
-        description: "delay between status checks (in milliseconds) for action-workflow-run-wait step"
-        required: true
-        default: '10000'        
 
   workflow_run:
     workflows: ["InitDev, Smoke Tests", "InitDev, Unit tests, Integration tests, Package", "InitDev, MultiTenancy"]
@@ -25,6 +16,10 @@ on:
 
 permissions: read-all
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 env:
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
   AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}
@@ -33,15 +28,23 @@ env:
   REPOSITORY_OWNER: ${{ GITHUB.REPOSITORY_OWNER }}
 
 jobs:
+  assert-all-required-workflows-succeeded:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: ahmadnassri/action-workflow-run-wait@2aa3d9e1a12ecaaa9908e368eaf2123bb084323e #v1.4.4
+        with:
+          timeout: 1800000
+          delay: 10000
+
   FindStandardAndExtensionVersions:
+    needs: assert-all-required-workflows-succeeded
     uses: Ed-Fi-Alliance-OSS/Ed-Fi-ODS/.github/workflows/Find Standard and Extension Versions.yml@874b608a0f3a14243e0035dd1222169fafcbe8d3
     with:
       calling_branch: ${{ github.head_ref || github.ref_name }}
 
   build:
 
     runs-on: ubuntu-24.04    
-    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
     needs: FindStandardAndExtensionVersions
 
     strategy:
@@ -55,11 +58,6 @@ jobs:
       with:
           repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Implementation
           path: Ed-Fi-ODS-Implementation/
-    - name: Wait for  ["InitDev, Smoke Tests", "InitDev, Unit tests, Integration tests, Package", "InitDev, MultiTenancy"] workflows to Complete
-      uses: ahmadnassri/action-workflow-run-wait@2aa3d9e1a12ecaaa9908e368eaf2123bb084323e #v1.4.4 
-      with:
-          timeout: ${{inputs.timeout}}
-          delay: ${{inputs.delay}}   
     - name: Check for Azure token
       if: ${{ env.REPOSITORY_OWNER == 'Ed-Fi-Alliance-OSS' && env.AZURE_ARTIFACT_NUGET_KEY == '' }}
       run: | 

.github/workflows/Publish to Docker Hub.yml

@@ -24,6 +24,10 @@ on:
 
 permissions: read-all
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 env:
   DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
   DOCKER_USERNAME: ${{ vars.DOCKER_USERNAME }}
@@ -35,8 +39,16 @@ env:
   BASE_BRANCH: ${{ GITHUB.HEAD_REF || GITHUB.REF_NAME }}
 
 jobs:
+  assert-all-required-workflows-succeeded:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: ahmadnassri/action-workflow-run-wait@2aa3d9e1a12ecaaa9908e368eaf2123bb084323e #v1.4.4
+        with:
+          timeout: 1800000
+          delay: 10000
 
   FindStandardAndExtensionVersions:
+    needs: assert-all-required-workflows-succeeded
     uses: Ed-Fi-Alliance-OSS/Ed-Fi-ODS/.github/workflows/Find Standard and Extension Versions.yml@874b608a0f3a14243e0035dd1222169fafcbe8d3
     with:
       calling_branch: ${{ github.head_ref || github.ref_name }}