Skip to content

Commit f838efd

Browse files
dhalbertdhalbert
committed
.github: -j4 instead of -j2; separate names for docs builds
1 parent deff5e1 commit f838efd

File tree

7 files changed

+18
-22
lines changed

7 files changed

+18
-22
lines changed

‎.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 -j 2
19+
make -j4
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 -j2
31+
run: make -C mpy-cross -j4
3232
shell: bash
3333
env:
3434
CP_VERSION: ${{ inputs.cp-version }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
sudo apt-get install -y mingw-w64
5555
5656
- name: Build mpy-cross.${{ matrix.mpy-cross }}
57-
run: make -C mpy-cross -j2 -f Makefile.${{ matrix.mpy-cross }}
57+
run: make -C mpy-cross -j4 -f Makefile.${{ matrix.mpy-cross }}
5858

5959
- name: Set output
6060
run: |

‎.github/workflows/build.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ jobs:
126126
python3 --version
127127
msgfmt --version
128128
- name: Build mpy-cross
129-
run: make -C mpy-cross -j2
129+
run: make -C mpy-cross -j4
130130
- uses: actions/upload-artifact@v4
131131
with:
132132
name: mpy-cross-macos-11-x64
133133
path: mpy-cross/build/mpy-cross
134134
- name: Build mpy-cross (arm64)
135-
run: make -C mpy-cross -j2 -f Makefile.m1 V=2
135+
run: make -C mpy-cross -j4 -f Makefile.m1 V=2
136136
- uses: actions/upload-artifact@v4
137137
with:
138138
name: mpy-cross-macos-11-arm64
@@ -182,7 +182,7 @@ jobs:
182182
sudo apt-get install -y latexmk librsvg2-bin texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
183183
pip install -r requirements-doc.txt
184184
- name: Build and Validate Stubs
185-
run: make check-stubs -j2
185+
run: make check-stubs -j4
186186
- uses: actions/upload-artifact@v4
187187
with:
188188
name: stubs
@@ -191,14 +191,14 @@ jobs:
191191
run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
192192
- uses: actions/upload-artifact@v4
193193
with:
194-
name: docs
194+
name: docs-html
195195
path: _build/html
196196
- name: Test Documentation Build (LaTeX/PDF)
197197
run: |
198198
make latexpdf
199199
- uses: actions/upload-artifact@v4
200200
with:
201-
name: docs
201+
name: docs-latexpdf
202202
path: _build/latex
203203
- name: Upload to S3
204204
uses: ./.github/actions/upload_aws
@@ -271,17 +271,17 @@ jobs:
271271
- name: Set up submodules
272272
uses: ./.github/actions/deps/submodules
273273
- name: build mpy-cross
274-
run: make -j2 -C mpy-cross
274+
run: make -j4 -C mpy-cross
275275
- name: build rp2040
276-
run: make -j2 -C ports/raspberrypi BOARD=adafruit_feather_rp2040 TRANSLATION=de_DE
276+
run: make -j4 -C ports/raspberrypi BOARD=adafruit_feather_rp2040 TRANSLATION=de_DE
277277
- name: build samd21
278-
run: make -j2 -C ports/atmel-samd BOARD=feather_m0_express TRANSLATION=zh_Latn_pinyin
278+
run: make -j4 -C ports/atmel-samd BOARD=feather_m0_express TRANSLATION=zh_Latn_pinyin
279279
- name: build samd51
280-
run: make -j2 -C ports/atmel-samd BOARD=feather_m4_express TRANSLATION=es
280+
run: make -j4 -C ports/atmel-samd BOARD=feather_m4_express TRANSLATION=es
281281
- name: build nrf
282-
run: make -j2 -C ports/nrf BOARD=feather_nrf52840_express TRANSLATION=fr
282+
run: make -j4 -C ports/nrf BOARD=feather_nrf52840_express TRANSLATION=fr
283283
- name: build stm
284-
run: make -j2 -C ports/stm BOARD=feather_stm32f405_express TRANSLATION=pt_BR
284+
run: make -j4 -C ports/stm BOARD=feather_stm32f405_express TRANSLATION=pt_BR
285285
# I gave up trying to do esp builds on windows when I saw
286286
# ERROR: Platform MINGW64_NT-10.0-17763-x86_64 appears to be unsupported
287287
# https://github.com/espressif/esp-idf/issues/7062

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
riscv64-unknown-elf-gcc --version || true
8282
mkfs.fat --version || true
8383
- name: Build board
84-
run: make -j2 ${{ inputs.flags }} BOARD=${{ inputs.board }} DEBUG=${{ inputs.debug && '1' || '0' }} TRANSLATION=${{ inputs.language }}
84+
run: make -j4 ${{ inputs.flags }} BOARD=${{ inputs.board }} DEBUG=${{ inputs.debug && '1' || '0' }} TRANSLATION=${{ inputs.language }}
8585
working-directory: ports/${{ steps.set-up-port.outputs.port }}
8686
- name: Upload artifact
8787
uses: actions/upload-artifact@v4

‎.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 -j2
48+
run: make -C ports/unix VARIANT=coverage -j4
4949
- name: Run tests
50-
run: ./run-tests.py -j2 ${{ env[format('TEST_{0}', matrix.test)] }}
50+
run: ./run-tests.py -j4 ${{ env[format('TEST_{0}', matrix.test)] }}
5151
working-directory: tests
5252
- name: Print failure info
53-
run: ./run-tests.py -j2 --print-failures
53+
run: ./run-tests.py -j4 --print-failures
5454
if: failure()
5555
working-directory: tests
5656
- name: Build native modules

‎tools/build_release_files.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919
for port in build_info.SUPPORTED_PORTS:
2020
result = subprocess.run("rm -rf ../ports/{port}/build*".format(port=port), shell=True)
2121

22-
PARALLEL = "-j 4"
23-
if "GITHUB_ACTION" in os.environ:
24-
PARALLEL = "-j 2"
25-
2622
all_boards = build_info.get_board_mapping()
2723
build_boards = list(all_boards.keys())
2824
if "BOARDS" in os.environ:

0 commit comments

Comments
 (0)