Update build.yml

lupyuen5 · Oct 5, 2024 · 242dcc5 · 242dcc5
1 parent 1dab07a
commit 242dcc5
Showing 1 changed file with 33 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -116,8 +116,9 @@ jobs:
           path: sources.tar.gz
 
   #### Comment
-  Get-Arch:
-    uses: lupyuen5/label-nuttx/.github/workflows/arch.yml@master #### Change lupyuen5
+  Get-Arch-Linux:
+    #### Change lupyuen5
+    uses: lupyuen5/label-nuttx/.github/workflows/arch.yml@master
     needs: Fetch-Source
     with:
       os: Linux
@@ -131,55 +132,41 @@ jobs:
         ]
 
   Linux:
-    needs: Get-Arch
+    needs: Get-Arch-Linux
     runs-on: ubuntu-latest
     env:
       DOCKER_BUILDKIT: 1
 
     strategy:
       max-parallel: 12
       matrix:
-        boards: ${{ fromJSON(needs.Get-Arch.outputs.selected_builds) }}
+        boards: ${{ fromJSON(needs.Get-Arch-Linux.outputs.selected_builds) }}
 
     steps:
 
-      #### Remove?
-      - name: Get arch
-        id: get-arch
-        run: |
-          skip_build=${{ needs.Get-Arch.outputs.skip_build }}
-          echo skip_build=$skip_build ####
-          echo "skip_build=1" >> $GITHUB_OUTPUT
-
       - name: Download Source Artifact
-        if: ${{ steps.get-arch.outputs.skip_build != '1' }}
         uses: actions/download-artifact@v4
         with:
           name: source-bundle
           path: .
 
       - name: Extract sources
-        if: ${{ steps.get-arch.outputs.skip_build != '1' }}
         run: tar zxf sources.tar.gz
 
       - name: Docker Login
-        if: ${{ steps.get-arch.outputs.skip_build != '1' }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Docker Pull
-        if: ${{ steps.get-arch.outputs.skip_build != '1' }}
         run: docker pull ghcr.io/apache/nuttx/apache-nuttx-ci-linux
 
       - name: Export NuttX Repo SHA
-        if: ${{ steps.get-arch.outputs.skip_build != '1' }}
         run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
 
       - name: Run builds
-        if: ${{ steps.get-arch.outputs.skip_build != '1' }}
         uses: ./sources/nuttx/.github/actions/ci-container
         env:
           BLOBDIR: /tools/blobs
@@ -203,15 +190,27 @@ jobs:
           path: buildartifacts/
         continue-on-error: true
 
+  #### Comment
+  Get-Arch-macOS:
+    #### Change lupyuen5
+    uses: lupyuen5/label-nuttx/.github/workflows/arch.yml@master
+    needs: Fetch-Source
+    with:
+      os: Linux
+      #### Remove
+      board: TestBoard
+      boards: |
+        ["macos", "sim-01", "sim-02"]
+
   macOS:
     permissions:
       contents: none
     runs-on: macos-13
-    needs: Fetch-Source
+    needs: Get-Arch-macOS
     strategy:
       max-parallel: 2
       matrix:
-        boards: [macos, sim-01, sim-02]
+        boards: ${{ fromJSON(needs.Get-Arch-macOS.outputs.selected_builds) }}
     steps:
       - name: Download Source Artifact
         uses: actions/download-artifact@v4
@@ -252,14 +251,26 @@ jobs:
           path: buildartifacts/
         continue-on-error: true
 
-  msys2:
+  #### Comment
+  Get-Arch-msys2:
+    #### Change lupyuen5
+    uses: lupyuen5/label-nuttx/.github/workflows/arch.yml@master
     needs: Fetch-Source
+    with:
+      os: Linux
+      #### Remove
+      board: TestBoard
+      boards: |
+        ["msys2"]
+
+  msys2:
+    needs: Get-Arch-msys2
     runs-on: windows-latest
     strategy:
       fail-fast: false
       max-parallel: 1
       matrix:
-        boards: [msys2]
+        boards: ${{ fromJSON(needs.Get-Arch-msys2.outputs.selected_builds) }}
 
     defaults:
       run: