build(gha): run build step before test to avoid nx cache issues

myparcelnl · Jul 10, 2024 · 51886c8 · 51886c8
1 parent 1bf9ded
commit 51886c8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 38 deletions.
diff --git a/.github/workflows/bundlewatch.yml → .github/workflows/build.yml b/.github/workflows/bundlewatch.yml → .github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: 'Run bundlewatch'
+name: 'Build and run bundlewatch'
 
 on:
   workflow_call:
@@ -7,7 +7,7 @@ env:
   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
 jobs:
-  bundlewatch:
+  build:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -21,19 +21,19 @@ jobs:
     uses: ./.github/workflows/setup.yml
     secrets: inherit
 
-  bundlewatch:
+  build:
     needs: setup
-    uses: ./.github/workflows/bundlewatch.yml
+    uses: ./.github/workflows/build.yml
     secrets: inherit
 
   test:
-    needs: setup
+    needs: build
     uses: ./.github/workflows/test.yml
     secrets: inherit
 
   rebase-prs:
     needs:
       - test
-      - bundlewatch
+      - build
     uses: ./.github/workflows/rebase-prs.yml
     secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,28 +31,22 @@ jobs:
       - uses: myparcelnl/actions/has-refs-between@v4
         id: has-refs
 
-  # Run setup initially to save cache and time on subsequent jobs
-  setup:
+  build:
     needs: prepare
     if: inputs.force == 'true' || needs.prepare.outputs.has-refs == 'true'
-    uses: ./.github/workflows/setup.yml
-    secrets: inherit
-
-  bundlewatch:
-    needs: setup
-    uses: ./.github/workflows/bundlewatch.yml
+    uses: ./.github/workflows/build.yml
     secrets: inherit
 
   test:
-    needs: setup
+    needs: build
     uses: ./.github/workflows/test.yml
     secrets: inherit
 
   release:
     runs-on: ubuntu-22.04
     needs:
       - test
-      - bundlewatch
+      - build
     steps:
       - uses: myparcelnl/actions/setup-git-credentials@v4
         id: credentials

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -18,17 +18,11 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # Run setup initially to save cache and time on subsequent jobs
-  setup:
-    uses: ./.github/workflows/setup.yml
-    secrets: inherit
-
-  bundlewatch:
-    needs: setup
-    uses: ./.github/workflows/bundlewatch.yml
+  build:
+    uses: ./.github/workflows/build.yml
     secrets: inherit
 
   test:
-    needs: setup
+    needs: build
     uses: ./.github/workflows/test.yml
     secrets: inherit
diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml