move ci win/mac to build_cmake.yml

hathach · May 10, 2024 · b1238f6 · b1238f6
1 parent f732af9
commit b1238f6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -91,3 +91,18 @@ jobs:
       toolchain: ${{ matrix.toolchain }}
       toolchain_url: ${{ fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain].toolchain_url }}
       build-family: ${{ toJSON(fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain].family) }}
+
+  # ---------------------------------------
+  # Build Make on Windows/MacOS
+  # ---------------------------------------
+  make-os:
+    uses: ./.github/workflows/build_family.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, macos-latest]
+    with:
+      os: ${{ matrix.os }}
+      build-system: 'make'
+      toolchain: 'arm-gcc'
+      build-family: '-b stm32f411disco'
diff --git a/.github/workflows/build_family.yml b/.github/workflows/build_family.yml
@@ -10,15 +10,19 @@ on:
         required: true
         type: string
       toolchain_url:
-        required: true
+        required: false
         type: string
       build-family:
         required: true
         type: string
+      os:
+        required: true
+        type: string
+        default: 'ubuntu-latest'
 
 jobs:
   family:
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.os }}
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/build_win_mac.yml b/.github/workflows/build_win_mac.yml
@@ -27,6 +27,7 @@ jobs:
   # Build ARM family
   # ---------------------------------------
   build-arm:
+    if: false
     strategy:
       fail-fast: false
       matrix:
@@ -49,7 +50,7 @@ jobs:
 
     - name: Get Dependencies
       run: |
-        python3 tools/get_deps.py stm32f4
+        python3 tools/get_deps.py stm32f2
 
     - name: Build
       run: python3 tools/build.py -s make stm32f2