Skip to content

Commit 02066c0

Browse files
committed
run arm-iar with non-forked PR
1 parent 0220852 commit 02066c0

File tree

3 files changed

+7
-33
lines changed

3 files changed

+7
-33
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
3131
# only build IAR if not forked PR, since IAR token is not shared
3232
if [ -z $CIRCLE_PR_USERNAME ]; then
33-
BUILDSYSTEM_TOOLCHAIN+=("make arm-iar")
33+
BUILDSYSTEM_TOOLCHAIN+=("cmake arm-iar")
3434
fi
3535
3636
RESOURCE_LARGE='["nrf", "imxrt", "stm32f4", "stm32h7"]'

.github/workflows/build.yml

+5-31
Original file line numberDiff line numberDiff line change
@@ -111,50 +111,24 @@ jobs:
111111

112112
# ---------------------------------------
113113
# Build IAR
114-
# Since IAR Token secret is not passed to forked PR, only build on PR from the same repo
114+
# Since IAR Token secret is not passed to forked PR, only build non-forked PR with make.
115+
# cmake is built by circle-ci. Due to IAR limit capacity, only build oe per family
115116
# ---------------------------------------
116117
arm-iar:
117-
if: github.repository_owner == 'hathach' && github.event_name == 'push'
118+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false
118119
needs: set-matrix
119120
uses: ./.github/workflows/build_util.yml
120121
secrets: inherit
121122
strategy:
122123
fail-fast: false
123124
matrix:
124125
build-system:
125-
- 'cmake'
126+
- 'make'
126127
with:
127128
build-system: ${{ matrix.build-system }}
128129
toolchain: 'arm-iar'
129130
build-args: ${{ toJSON(fromJSON(needs.set-matrix.outputs.json)['arm-iar']) }}
130-
one-per-family: ${{ github.event_name == 'push' }}
131-
132-
# arm-iar:
133-
# if: github.repository_owner == 'hathach' && github.event_name == 'push'
134-
# needs: set-matrix
135-
# runs-on: [self-hosted, Linux, X64, hifiphile]
136-
# env:
137-
# BUILD_ARGS: ${{ join(fromJSON(needs.set-matrix.outputs.json)['arm-iar'], ' ') }}
138-
# IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_LMS_BEARER_TOKEN }}
139-
# steps:
140-
# - name: Clean workspace
141-
# run: |
142-
# echo "Cleaning up previous run"
143-
# rm -rf "${{ github.workspace }}"
144-
# mkdir -p "${{ github.workspace }}"
145-
#
146-
# - name: Toolchain version
147-
# run: |
148-
# iccarm --version
149-
#
150-
# - name: Checkout TinyUSB
151-
# uses: actions/checkout@v4
152-
#
153-
# - name: Get Dependencies
154-
# run: python3 tools/get_deps.py $BUILD_ARGS
155-
#
156-
# - name: Build
157-
# run: python3 tools/build.py --one-per-family --toolchain iar $BUILD_ARGS
131+
one-per-family: true
158132

159133
# ---------------------------------------
160134
# Zephyr

.github/workflows/hil_test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
# ---------------------------------------
9191
# Hardware in the loop (HIL)
9292
# self-hosted by HFP, build with IAR toolchain, for attached hardware checkout test/hil/hfp.json
93-
# Since IAR Token secret is not passed to forked PR, only build on PR from the same repo
93+
# Since IAR Token secret is not passed to forked PR, only build non-forked PR
9494
# ---------------------------------------
9595
hil-hfp:
9696
if: github.repository_owner == 'hathach' && github.event.pull_request.head.repo.fork == false

0 commit comments

Comments
 (0)