From 7ee288bc223db393d68c7bdb09bf7c05ffd2eb03 Mon Sep 17 00:00:00 2001
From: Ha Thach <thach@tinyusb.org>
Date: Sat, 29 Nov 2025 01:41:30 +0700
Subject: change armgcc setup to manual download due to issue with action
 (#3377)

* change armgcc setup to manual download due to issue with action
* build windows, macos with cmake as well
---
 .github/workflows/build.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0495ba6a9..f1b134b8a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,6 @@ on:
       - '.github/workflows/build_util.yml'
       - '.github/workflows/ci_set_matrix.py'
   pull_request:
-    branches: [ master ]
     paths:
       - 'src/**'
       - 'examples/**'
@@ -49,7 +48,7 @@ jobs:
         id: set-matrix-json
         run: |
           # build matrix
-          MATRIX_JSON=$(python .github/workflows/ci_set_matrix.py)
+          MATRIX_JSON=$(python .github/workflows/ci_set_matrix.py)/
           echo "matrix=$MATRIX_JSON"
           echo "matrix=$MATRIX_JSON" >> $GITHUB_OUTPUT
           # hil matrix
@@ -127,19 +126,20 @@ jobs:
       one-per-family: true
 
   # ---------------------------------------
-  # Build Make on Windows/MacOS
+  # Build Make/CMake on Windows/MacOS
   # ---------------------------------------
-  make-os:
+  build-os:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/build_util.yml
     strategy:
       fail-fast: false
       matrix:
         os: [windows-latest, macos-latest]
+        build-system: [ 'make', 'cmake' ]
     with:
       os: ${{ matrix.os }}
-      build-system: 'make'
-      toolchain: 'arm-gcc'
+      build-system: ${{ matrix.build-system }}
+      toolchain: 'arm-gcc-${{ matrix.os }}'
       build-args: '["stm32h7"]'
       one-per-family: true
 
-- 
cgit v1.3.1