refactor: integrate infrastructure workflow into ci workflow

primev · Jul 4, 2024 · dbe2d62 · dbe2d62
1 parent e0705e5
commit dbe2d62
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -216,3 +216,12 @@ jobs:
           git diff --name-only --exit-code . || (echo "Generated files not in parity with the source files." && exit 1)
           git reset --hard HEAD
         working-directory: contracts-abi
+
+  infrastructure:
+    uses: ./.github/workflows/infrastructure.yml
+    secrets: inherit
+    needs:
+      - commitlint
+      - go-modules
+      - foundry
+      - contracts
diff --git a/.github/workflows/infrstructure.yml → .github/workflows/infrastructure.yml b/.github/workflows/infrstructure.yml → .github/workflows/infrastructure.yml
@@ -1,11 +1,7 @@
 name: infrastructure
 
 on:
-  workflow_run:
-    workflows:
-      - ci
-    types:
-      - completed
+  workflow_call:
   workflow_dispatch:
     inputs:
       profile:
@@ -50,7 +46,6 @@ jobs:
     name: Setup and Test Nomad Cluster
     runs-on: ubuntu-22.04
     timeout-minutes: 180
-    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
 
     steps:
       - name: Setup Environment
@@ -104,7 +99,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-          ref: ${{ github.event.workflow_run.head_branch }}
+          ref: ${{ github.event.workflow_run.head_branch || github.event.inputs.branch || github.ref }}
 
       - name: Setup Cache
         uses: actions/cache@v4