Skip to content

Commit ca84d5f

Browse files
committed
Merge remote-tracking branch 'upstream/main' into mabey/esp32-hmac-efuse-planning
2 parents 201bf9b + 7688f95 commit ca84d5f

7 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/actions/deps/ports/broadcom/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
tar -xaf dosfstools-4.2.tar.gz
1717
cd dosfstools-4.2
1818
./configure
19-
make -j4
19+
make -j$(nproc)
2020
cd src
2121
echo >> $GITHUB_PATH $(pwd)
2222
shell: bash

.github/actions/mpy_cross/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ runs:
2828

2929
- name: Build mpy-cross
3030
if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
31-
run: make -C mpy-cross -j4
31+
run: make -C mpy-cross -j$(nproc)
3232
shell: bash
3333
env:
3434
CP_VERSION: ${{ inputs.cp-version }}

.github/workflows/build-board-custom.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
BOARD: ${{ inputs.board }}
122122
FLAGS: ${{ inputs.flags }}
123123
DEBUG: ${{ inputs.debug && '1' || '0' }}
124-
run: make -j4 $FLAGS BOARD="$BOARD" DEBUG=$DEBUG TRANSLATION="$TRANSLATION"
124+
run: make -j$(nproc) $FLAGS BOARD="$BOARD" DEBUG=$DEBUG TRANSLATION="$TRANSLATION"
125125
working-directory: ports/${{ steps.board-to-port.outputs.port }}
126126
- name: Upload artifact
127127
uses: actions/upload-artifact@v7

.github/workflows/build-mpy-cross.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
sudo apt-get install -y mingw-w64
5656
5757
- name: Build mpy-cross.${{ matrix.mpy-cross }}
58-
run: make -C mpy-cross -j4 -f Makefile.${{ matrix.mpy-cross }}
58+
run: make -C mpy-cross -j$(nproc) -f Makefile.${{ matrix.mpy-cross }}
5959

6060
- name: Set output
6161
env:

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
python3 --version
141141
msgfmt --version
142142
- name: Build mpy-cross (arm64)
143-
run: make -C mpy-cross -j4 -f Makefile.m1 V=2
143+
run: make -C mpy-cross -j$(sysctl -n hw.ncpu) -f Makefile.m1 V=2
144144
- uses: actions/upload-artifact@v7
145145
with:
146146
name: mpy-cross-macos-arm64
@@ -184,7 +184,7 @@ jobs:
184184
sudo apt-get install -y latexmk librsvg2-bin texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
185185
pip install -r requirements-doc.txt
186186
- name: Build and Validate Stubs
187-
run: make check-stubs -j4
187+
run: make check-stubs -j$(nproc)
188188
- uses: actions/upload-artifact@v7
189189
with:
190190
name: stubs

.github/workflows/run-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ jobs:
4545
with:
4646
cp-version: ${{ inputs.cp-version }}
4747
- name: Build unix port
48-
run: make -C ports/unix VARIANT=coverage -j4
48+
run: make -C ports/unix VARIANT=coverage -j$(nproc)
4949
- name: Run tests
50-
run: ./run-tests.py -j4 ${{ env[format('TEST_{0}', matrix.test)] }}
50+
run: ./run-tests.py -j$(nproc) ${{ env[format('TEST_{0}', matrix.test)] }}
5151
working-directory: tests
5252
- name: Print failure info
53-
run: ./run-tests.py -j4 --print-failures
53+
run: ./run-tests.py -j$(nproc) --print-failures
5454
if: failure()
5555
working-directory: tests
5656
- name: Build native modules

.github/workflows/run-zephyr-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
- name: Set up external
3636
uses: ./.github/actions/deps/external
3737
- name: Build native sim target
38-
run: make -C ports/zephyr-cp -j2 BOARD=native_native_sim
38+
run: make -C ports/zephyr-cp -j$(nproc) BOARD=native_native_sim
3939
- name: Build bsim
40-
run: make -j 2 everything
40+
run: make -j $(nproc) everything
4141
working-directory: ports/zephyr-cp/tools/bsim
4242
- name: Build native_nrf5340bsim
43-
run: make -C ports/zephyr-cp -j2 BOARD=native_nrf5340bsim
43+
run: make -C ports/zephyr-cp -j$(nproc) BOARD=native_nrf5340bsim
4444
- name: Build native_nrf54lm20bsim
45-
run: make -C ports/zephyr-cp -j2 BOARD=native_nrf54lm20bsim
45+
run: make -C ports/zephyr-cp -j$(nproc) BOARD=native_nrf54lm20bsim
4646
- name: Run Zephyr tests
4747
run: make -C ports/zephyr-cp test

0 commit comments

Comments
 (0)