Skip to content

Commit

Permalink
.github: fixed Node.js 20 updates
Browse files Browse the repository at this point in the history
There are some incompatible changes with this major version bump, so committing separately.
  • Loading branch information
dhalbert committed Jan 25, 2024
1 parent 0f7c227 commit 39938c8
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/actions/mpy_cross/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ runs:
id: download-mpy-cross
if: inputs.download == 'true'
continue-on-error: true
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: mpy-cross
path: mpy-cross/build
Expand All @@ -36,7 +36,7 @@ runs:
- name: Upload mpy-cross
if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
continue-on-error: true
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: mpy-cross
path: mpy-cross/build/mpy-cross
7 changes: 4 additions & 3 deletions .github/workflows/build-boards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@ jobs:
board: ${{ fromJSON(inputs.boards) }}
steps:
- name: Set up repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: false
show-progress: false
fetch-depth: 1
- name: Set up python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Set up port
Expand Down Expand Up @@ -75,7 +76,7 @@ jobs:
PULL: ${{ github.event.number }}

- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.board }}
path: bin/${{ matrix.board }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/build-mpy-cross.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@ jobs:
OS_static-raspbian: linux-raspbian
steps:
- name: Set up repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: false
show-progress: false
fetch-depth: 1
- name: Set up python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Set up submodules
Expand Down Expand Up @@ -61,7 +62,7 @@ jobs:
echo >> $GITHUB_ENV "OS=${{ env[format('OS_{0}', matrix.mpy-cross)] }}"
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: mpy-cross.${{ env.EX }}
path: mpy-cross/build-${{ matrix.mpy-cross }}/mpy-cross.${{ env.EX }}
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: false
progress: false
show-progress: false
fetch-depth: 1
- name: Set up python
uses: actions/setup-python@v5
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: false
progress: false
show-progress: false
fetch-depth: 1
- name: Set up python
uses: actions/setup-python@v5
Expand All @@ -127,20 +127,20 @@ jobs:
msgfmt --version
- name: Build mpy-cross
run: make -C mpy-cross -j2
- uses: actions/upload-artifact@v3
- 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
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: mpy-cross-macos-11-arm64
path: mpy-cross/build-arm64/mpy-cross-arm64
- name: Make universal binary
run: lipo -create -output mpy-cross-macos-universal mpy-cross/build/mpy-cross mpy-cross/build-arm64/mpy-cross-arm64
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: mpy-cross-macos-11-universal
path: mpy-cross-macos-universal
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: false
progress: false
show-progress: false
fetch-depth: 1
- name: Set up python
uses: actions/setup-python@v5
Expand All @@ -183,20 +183,20 @@ jobs:
pip install -r requirements-doc.txt
- name: Build and Validate Stubs
run: make check-stubs -j2
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: stubs
path: circuitpython-stubs/dist/*
- name: Test Documentation Build (HTML)
run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: docs
path: _build/html
- name: Test Documentation Build (LaTeX/PDF)
run: |
make latexpdf
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: docs
path: _build/latex
Expand Down Expand Up @@ -266,7 +266,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: false
progress: false
show-progress: false
fetch-depth: 1
- name: Set up submodules
uses: ./.github/actions/deps/submodules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-website-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: false
progress: false
show-progress: false
fetch-depth: 1
- name: Set up python
uses: actions/setup-python@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/custom-board-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
run: make -j2 ${{ 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@v3
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.board }}-${{ inputs.language }}-${{ inputs.version }}${{ inputs.flags != '' && '-custom' || '' }}${{ inputs.debug && '-debug' || '' }}
path: ports/${{ steps.set-up-port.outputs.port }}/build-${{ inputs.board }}/firmware.*
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: false
progress: false
show-progress: false
fetch-depth: 1
- name: Set up python
uses: actions/setup-python@v5
Expand All @@ -41,7 +41,7 @@ jobs:
run: git diff > ~/pre-commit.patch
- name: Upload patch
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: patch
path: ~/pre-commit.patch
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: false
progress: false
show-progress: false
fetch-depth: 1
- name: Set up python
uses: actions/setup-python@v5
Expand Down

0 comments on commit 39938c8

Please sign in to comment.