fix: correct reusable workflow (#127)

* fix: correct reusable workflow * chore: multi-platform build is a reusable workflow * fix: remove 'needs: check' for build
ipfs-shipyard · Jun 22, 2022 · e52f066 · e52f066
1 parent e7e606f
commit e52f066
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 29 deletions.
diff --git a/.github/workflows/build-all-platforms.yml b/.github/workflows/build-all-platforms.yml
@@ -0,0 +1,21 @@
+name: Build and publish compliance reports
+on:
+  # This workflow should be required for 'test & maybe release' to succeed
+  # see https://docs.github.com/en/actions/using-workflows/reusing-workflows#creating-a-reusable-workflow
+  workflow_call:
+
+jobs:
+  build:
+    needs: check
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - run: npm run --if-present build
diff --git a/.github/workflows/build-and-publish-reports.yml b/.github/workflows/build-and-publish-reports.yml
@@ -1,7 +1,7 @@
 name: Build and publish compliance reports
 on:
   # This workflow should be required for 'test & maybe release' to succeed
-  # see https://docs.github.com/en/actions/using-workflows/reusing-workflows
+  # see https://docs.github.com/en/actions/using-workflows/reusing-workflows#creating-a-reusable-workflow
   workflow_call:
 
   workflow_dispatch:
@@ -24,16 +24,15 @@ on:
   pull_request:
     branches: [ main ]
 jobs:
-  checkout:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout 🛎️
-        uses: actions/checkout@v3
-      - uses: ipfs/aegir/actions/cache-node-modules@master
+
+  build:
+    uses: ./.github/workflows/build-all-platforms.yml
+    with:
+      secrets: inherit
 
   check-pinata-compliance:
     runs-on: ubuntu-latest
-    needs: [checkout]
+    needs: [build]
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v3
@@ -55,7 +54,7 @@ jobs:
 
   check-estuary-compliance:
     runs-on: ubuntu-latest
-    needs: [checkout]
+    needs: [build]
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v3
@@ -77,7 +76,7 @@ jobs:
 
   check-nft-dot-storage-compliance:
     runs-on: ubuntu-latest
-    needs: [checkout]
+    needs: [build]
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v3
@@ -99,7 +98,7 @@ jobs:
 
   check-web3-dot-storage-compliance:
     runs-on: ubuntu-latest
-    needs: [checkout]
+    needs: [build]
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v3

diff --git a/.github/workflows/js-test-and-release.yml b/.github/workflows/js-test-and-release.yml
@@ -22,28 +22,17 @@ jobs:
 
   build:
     needs: check
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
-      - run: npm run --if-present build
+    uses: ./.github/workflows/build-all-platforms.yml
+    with:
+      secrets: inherit
 
-  # see https://docs.github.com/en/actions/using-workflows/reusing-workflows
+  # see https://docs.github.com/en/actions/using-workflows/reusing-workflows#calling-a-reusable-workflow
   run_reports:
     needs: build
-    runs-on: ubuntu-latest
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    steps:
-      - uses: ./.github/workflows/build-and-publish-reports.yml
-        with:
-          secrets: inherit
+    uses: ./.github/workflows/build-and-publish-reports.yml
+    with:
+      secrets: inherit
 
   release:
     needs: [check, build, run_reports]