From 46d2d4199ea31babbffff51f9eaa65eda81c659b Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 17 Apr 2025 17:26:36 +0700
Subject: [PATCH] run arm-iar with non-forked PR

---
 .circleci/config.yml           |  2 +-
 .github/workflows/build.yml    | 36 +++++-----------------------------
 .github/workflows/hil_test.yml |  2 +-
 3 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a7ae6980f..0b11b50e4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,7 +30,7 @@ jobs:
 
             # only build IAR if not forked PR, since IAR token is not shared
             if [ -z $CIRCLE_PR_USERNAME ]; then
-              BUILDSYSTEM_TOOLCHAIN+=("make arm-iar")
+              BUILDSYSTEM_TOOLCHAIN+=("cmake arm-iar")
             fi
 
             RESOURCE_LARGE='["nrf", "imxrt", "stm32f4", "stm32h7"]'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6419efbe8..7fb13af74 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -111,10 +111,11 @@ jobs:
 
   # ---------------------------------------
   # Build IAR
-  # Since IAR Token secret is not passed to forked PR, only build on PR from the same repo
+  # Since IAR Token secret is not passed to forked PR, only build non-forked PR with make.
+  # cmake is built by circle-ci. Due to IAR limit capacity, only build oe per family
   # ---------------------------------------
   arm-iar:
-    if: github.repository_owner == 'hathach' && github.event_name == 'push'
+    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
     needs: set-matrix
     uses: ./.github/workflows/build_util.yml
     secrets: inherit
@@ -122,39 +123,12 @@ jobs:
       fail-fast: false
       matrix:
         build-system:
-          - 'cmake'
+          - 'make'
     with:
       build-system: ${{ matrix.build-system }}
       toolchain: 'arm-iar'
       build-args: ${{ toJSON(fromJSON(needs.set-matrix.outputs.json)['arm-iar']) }}
-      one-per-family: ${{ github.event_name == 'push' }}
-
-#  arm-iar:
-#    if: github.repository_owner == 'hathach' && github.event_name == 'push'
-#    needs: set-matrix
-#    runs-on: [self-hosted, Linux, X64, hifiphile]
-#    env:
-#      BUILD_ARGS: ${{ join(fromJSON(needs.set-matrix.outputs.json)['arm-iar'], ' ') }}
-#      IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_LMS_BEARER_TOKEN }}
-#    steps:
-#      - name: Clean workspace
-#        run: |
-#          echo "Cleaning up previous run"
-#          rm -rf "${{ github.workspace }}"
-#          mkdir -p "${{ github.workspace }}"
-#
-#      - name: Toolchain version
-#        run: |
-#          iccarm --version
-#
-#      - name: Checkout TinyUSB
-#        uses: actions/checkout@v4
-#
-#      - name: Get Dependencies
-#        run: python3 tools/get_deps.py $BUILD_ARGS
-#
-#      - name: Build
-#        run: python3 tools/build.py --one-per-family --toolchain iar $BUILD_ARGS
+      one-per-family: true
 
   # ---------------------------------------
   # Zephyr
diff --git a/.github/workflows/hil_test.yml b/.github/workflows/hil_test.yml
index 257416213..0ad37ffce 100644
--- a/.github/workflows/hil_test.yml
+++ b/.github/workflows/hil_test.yml
@@ -90,7 +90,7 @@ jobs:
   # ---------------------------------------
   # Hardware in the loop (HIL)
   # self-hosted by HFP, build with IAR toolchain, for attached hardware checkout test/hil/hfp.json
-  # Since IAR Token secret is not passed to forked PR, only build on PR from the same repo
+  # Since IAR Token secret is not passed to forked PR, only build non-forked PR
   # ---------------------------------------
   hil-hfp:
     if: github.repository_owner == 'hathach' && github.event.pull_request.head.repo.fork == false