.github: -j4 instead of -j2; separate names for docs builds

Author: dhalbert

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

@@ -16,7 +16,7 @@ runs:
         tar -xaf dosfstools-4.2.tar.gz
         cd dosfstools-4.2
         ./configure
-        make -j 2
+        make -j4
         cd src
         echo >> $GITHUB_PATH $(pwd)
       shell: bash

.github/actions/mpy_cross/action.yml

@@ -28,7 +28,7 @@ runs:
 
     - name: Build mpy-cross
       if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
-      run: make -C mpy-cross -j2
+      run: make -C mpy-cross -j4
       shell: bash
       env:
         CP_VERSION: ${{ inputs.cp-version }}

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

@@ -54,7 +54,7 @@ jobs:
         sudo apt-get install -y mingw-w64
 
     - name: Build mpy-cross.${{ matrix.mpy-cross }}
-      run: make -C mpy-cross -j2 -f Makefile.${{ matrix.mpy-cross }}
+      run: make -C mpy-cross -j4 -f Makefile.${{ matrix.mpy-cross }}
 
     - name: Set output
       run: |

.github/workflows/build.yml

@@ -126,13 +126,13 @@ jobs:
         python3 --version
         msgfmt --version
     - name: Build mpy-cross
-      run: make -C mpy-cross -j2
+      run: make -C mpy-cross -j4
     - uses: actions/upload-artifact@v4
       with:
         name: mpy-cross-macos-11-x64
         path: mpy-cross/build/mpy-cross
     - name: Build mpy-cross (arm64)
-      run: make -C mpy-cross -j2 -f Makefile.m1 V=2
+      run: make -C mpy-cross -j4 -f Makefile.m1 V=2
     - uses: actions/upload-artifact@v4
       with:
         name: mpy-cross-macos-11-arm64
@@ -182,7 +182,7 @@ jobs:
         sudo apt-get install -y latexmk librsvg2-bin texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
         pip install -r requirements-doc.txt
     - name: Build and Validate Stubs
-      run: make check-stubs -j2
+      run: make check-stubs -j4
     - uses: actions/upload-artifact@v4
       with:
         name: stubs
@@ -191,14 +191,14 @@ jobs:
       run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
     - uses: actions/upload-artifact@v4
       with:
-        name: docs
+        name: docs-html
         path: _build/html
     - name: Test Documentation Build (LaTeX/PDF)
       run: |
         make latexpdf
     - uses: actions/upload-artifact@v4
       with:
-        name: docs
+        name: docs-latexpdf
         path: _build/latex
     - name: Upload to S3
       uses: ./.github/actions/upload_aws
@@ -271,17 +271,17 @@ jobs:
     - name: Set up submodules
       uses: ./.github/actions/deps/submodules
     - name: build mpy-cross
-      run: make -j2 -C mpy-cross
+      run: make -j4 -C mpy-cross
     - name: build rp2040
-      run: make -j2 -C ports/raspberrypi BOARD=adafruit_feather_rp2040 TRANSLATION=de_DE
+      run: make -j4 -C ports/raspberrypi BOARD=adafruit_feather_rp2040 TRANSLATION=de_DE
     - name: build samd21
-      run: make -j2 -C ports/atmel-samd BOARD=feather_m0_express TRANSLATION=zh_Latn_pinyin
+      run: make -j4 -C ports/atmel-samd BOARD=feather_m0_express TRANSLATION=zh_Latn_pinyin
     - name: build samd51
-      run: make -j2 -C ports/atmel-samd BOARD=feather_m4_express TRANSLATION=es
+      run: make -j4 -C ports/atmel-samd BOARD=feather_m4_express TRANSLATION=es
     - name: build nrf
-      run: make -j2 -C ports/nrf BOARD=feather_nrf52840_express TRANSLATION=fr
+      run: make -j4 -C ports/nrf BOARD=feather_nrf52840_express TRANSLATION=fr
     - name: build stm
-      run: make -j2 -C ports/stm BOARD=feather_stm32f405_express TRANSLATION=pt_BR
+      run: make -j4 -C ports/stm BOARD=feather_stm32f405_express TRANSLATION=pt_BR
     # I gave up trying to do esp builds on windows when I saw
     # ERROR: Platform MINGW64_NT-10.0-17763-x86_64 appears to be unsupported
     # https://github.com/espressif/esp-idf/issues/7062

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

@@ -81,7 +81,7 @@ jobs:
         riscv64-unknown-elf-gcc --version || true
         mkfs.fat --version || true
     - name: Build board
-      run: make -j2 ${{ inputs.flags }} BOARD=${{ inputs.board }} DEBUG=${{ inputs.debug && '1' || '0' }} TRANSLATION=${{ inputs.language }}
+      run: make -j4 ${{ inputs.flags }} BOARD=${{ inputs.board }} DEBUG=${{ inputs.debug && '1' || '0' }} TRANSLATION=${{ inputs.language }}
       working-directory: ports/${{ steps.set-up-port.outputs.port }}
     - name: Upload artifact
       uses: actions/upload-artifact@v4

.github/workflows/run-tests.yml

@@ -45,12 +45,12 @@ jobs:
       with:
         cp-version: ${{ inputs.cp-version }}
     - name: Build unix port
-      run: make -C ports/unix VARIANT=coverage -j2
+      run: make -C ports/unix VARIANT=coverage -j4
     - name: Run tests
-      run: ./run-tests.py -j2 ${{ env[format('TEST_{0}', matrix.test)] }}
+      run: ./run-tests.py -j4 ${{ env[format('TEST_{0}', matrix.test)] }}
       working-directory: tests
     - name: Print failure info
-      run: ./run-tests.py -j2 --print-failures
+      run: ./run-tests.py -j4 --print-failures
       if: failure()
       working-directory: tests
     - name: Build native modules

tools/build_release_files.py

@@ -19,10 +19,6 @@
 for port in build_info.SUPPORTED_PORTS:
     result = subprocess.run("rm -rf ../ports/{port}/build*".format(port=port), shell=True)
 
-PARALLEL = "-j 4"
-if "GITHUB_ACTION" in os.environ:
-    PARALLEL = "-j 2"
-
 all_boards = build_info.get_board_mapping()
 build_boards = list(all_boards.keys())
 if "BOARDS" in os.environ: