8000 Merge remote-tracking branch 'origin/main' into q-and-d-uvc · rsbohn/circuitpython@1c95a85 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1c95a85

Browse files
jeplerjepler
committed
Merge remote-tracking branch 'origin/main' into q-and-d-uvc
2 parents 745df2c + 96be941 commit 1c95a85

File tree

115 files changed

+1981
-687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+1981
-687
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/deps/ports/espressif/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ runs:
1818
shell: bash
1919

2020
- name: Cache IDF submodules
21-
uses: actions/cache@v3
21+
uses: actions/cache@v4
2222
with:
2323
path: |
2424
.git/modules/ports/espressif/esp-idf
2525
ports/espressif/esp-idf
2626
key: submodules-idf-${{ steps.idf-commit.outputs.commit }}
2727

2828
- name: Cache IDF tools
29-
uses: actions/cache@v3
29+
uses: actions/cache@v4
3030
with:
3131
path: ${{ env.IDF_TOOLS_PATH }}
3232
key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-idf-${{ steps.idf-commit.outputs.commit }}

‎.github/actions/deps/python/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ runs:
1616
- name: Cache python dependencies
1717
id: cache-python-deps
1818
if: inputs.action == 'cache'
19-
uses: actions/cache@v3
19+
uses: actions/cache@v4
2020
with:
2121
path: .cp_tools
2222
key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-cp-${{ hashFiles('requirements-dev.txt') }}
2323

2424
- name: Restore python dependencies
2525
id: restore-python-deps
2626
if: inputs.action == 'restore'
27-
uses: actions/cache/restore@v3
27+
uses: actions/cache/restore@v4
2828
with:
2929
path: .cp_tools
3030
key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-cp-${{ hashFiles('requirements-dev.txt') }}

‎.github/actions/deps/submodules/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ runs:
4848

4949
- name: Cache submodules
5050
if: ${{ inputs.action == 'cache' }}
51-
uses: actions/cache@v3
51+
uses: actions/cache@v4
5252
with:
5353
path: ".git/modules/\n${{ join(fromJSON(steps.create-submodule-status.outputs.submodules), '\n') }}"
5454
key: submodules-common-${{ hashFiles('submodule_status') }}
5555
enableCrossOsArchive: true
5656

5757
- name: Restore submodules
5858
if: ${{ inputs.action == 'restore' }}
59-
uses: actions/cache/restore@v3
59+
uses: actions/cache/restore@v4
6060
with:
6161
path: ".git/modules/\n${{ join(fromJSON(steps.create-submodule-status.outputs.submodules), '\n') }}"
6262
key: submodules-common-${{ hashFiles('submodule_status') }}

‎.github/actions/mpy_cross/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
id: download-mpy-cross
1717
if: inputs.download == 'true'
1818
continue-on-error: true
19-
uses: actions/download-artifact@v3
19+
uses: actions/download-artifact@v4
2020
with:
2121
name: mpy-cross
2222
path: mpy-cross/build
@@ -28,15 +28,15 @@ 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 }}
3535

3636
- name: Upload mpy-cross
3737
if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
3838
continue-on-error: true
39-
uses: actions/upload-artifact@v3
39+
uses: actions/upload-artifact@v4
4040
with:
4141
name: mpy-cross
4242
path: mpy-cross/build/mpy-cross

‎.github/workflows/build-boards.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@ jobs:
2626
board: ${{ fromJSON(inputs.boards) }}
2727
steps:
2828
- name: Set up repository
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030
with:
3131
submodules: false
32+
show-progress: false
3233
fetch-depth: 1
3334
- name: Set up python
34-
uses: actions/setup-python@v4
35+
uses: actions/setup-python@v5
3536
with:
3637
python-version: 3.x
3738
- name: Set up port
@@ -75,7 +76,7 @@ jobs:
7576
PULL: ${{ github.event.number }}
7677

7778
- name: Upload artifact
78-
uses: actions/upload-artifact@v3
79+
uses: actions/upload-artifact@v4
7980
with:
8081
name: ${{ matrix.board }}
8182
path: bin/${{ matrix.board }}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ jobs:
2828
OS_static-raspbian: linux-raspbian
2929
steps:
3030
- name: Set up repository
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232
with:
3333
submodules: false
34+
show-progress: false
3435
fetch-depth: 1
3536
- name: Set up python
36-
uses: actions/setup-python@v4
37+
uses: actions/setup-python@v5
3738
with:
3839
python-version: 3.x
3940
- name: Set up submodules
@@ -53,15 +54,15 @@ jobs:
5354
sudo apt-get install -y mingw-w64
5455
5556
- name: Build mpy-cross.${{ matrix.mpy-cross }}
56-
run: make -C mpy-cross -j2 -f Makefile.${{ matrix.mpy-cross }}
57+
run: make -C mpy-cross -j4 -f Makefile.${{ matrix.mpy-cross }}
5758

5859
- name: Set output
5960
run: |
6061
echo >> $GITHUB_ENV "EX=${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}"
6162
echo >> $GITHUB_ENV "OS=${{ env[format('OS_{0}', matrix.mpy-cross)] }}"
6263
6364
- name: Upload artifact
64-
uses: actions/upload-artifact@v3
65+
uses: actions/upload-artifact@v4
6566
with:
6667
name: mpy-cross.${{ env.EX }}
6768
path: mpy-cross/build-${{ matrix.mpy-cross }}/mpy-cross.${{ env.EX }}

‎.github/workflows/build.yml

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ jobs:
2828
env:
2929
GITHUB_CONTEXT: ${{ toJson(github) }}
3030
- name: Set up repository
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232
with:
3333
submodules: false
34+
show-progress: false
3435
fetch-depth: 1
3536
- name: Set up python
36-
uses: actions/setup-python@v4
37+
uses: actions/setup-python@v5
3738
with:
3839
python-version: 3.x
3940
- name: Duplicate USB VID/PID check
@@ -108,12 +109,13 @@ jobs:
108109
CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
109110
steps:
110111
- name: Set up repository
111-
uses: actions/checkout@v3
112+
uses: actions/checkout@v4
112113
with:
113114
submodules: false
115+
show-progress: false
114116
fetch-depth: 1
115117
- name: Set up python
116-
uses: actions/setup-python@v4
118+
uses: actions/setup-python@v5
117119
with:
118120
python-version: 3.x
119121
- name: Set up submodules
@@ -124,21 +126,21 @@ jobs:
124126
python3 --version
125127
msgfmt --version
126128
- name: Build mpy-cross
127-
run: make -C mpy-cross -j2
128-
- uses: actions/upload-artifact@v3
129+
run: make -C mpy-cross -j4
130+
- uses: actions/upload-artifact@v4
129131
with:
130132
name: mpy-cross-macos-11-x64
131133
path: mpy-cross/build/mpy-cross
132134
- name: Build mpy-cross (arm64)
133-
run: make -C mpy-cross -j2 -f Makefile.m1 V=2
134-
- uses: actions/upload-artifact@v3
135+
run: make -C mpy-cross -j4 -f Makefile.m1 V=2
136+
- uses: actions/upload-artifact@v4
135137
with:
136138
name: mpy-cross-macos-11-arm64
137139
path: mpy-cross/build-arm64/mpy-cross-arm64
138140
- name: Make universal binary
139141
run: lipo -create -output mpy-cross-macos-universal mpy-cross/build/mpy-cross mpy-cross/build-arm64/mpy-cross-arm64
140142
- name: Upload artifact
141-
uses: actions/upload-artifact@v3
143+
uses: actions/upload-artifact@v4
142144
with:
143145
name: mpy-cross-macos-11-universal
144146
path: mpy-cross-macos-universal
@@ -163,12 +165,13 @@ jobs:
163165
CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
164166
steps:
165167
- name: Set up repository
166-
uses: actions/checkout@v3
168+
uses: actions/checkout@v4
167169
with:
168170
submodules: false
171+
show-progress: false
169172
fetch-depth: 1
170173
- name: Set up python
171-
uses: actions/setup-python@v4
174+
uses: actions/setup-python@v5
172175
with:
173176
python-version: 3.x
174177
- name: Set up submodules
@@ -179,23 +182,23 @@ jobs:
179182
sudo apt-get install -y latexmk librsvg2-bin texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
180183
pip install -r requirements-doc.txt
181184
- name: Build and Validate Stubs
182-
run: make check-stubs -j2
183-
- uses: actions/upload-artifact@v3
185+
run: make check-stubs -j4
186+
- uses: actions/upload-artifact@v4
184187
with:
185188
name: stubs
186189
path: circuitpython-stubs/dist/*
187190
- name: Test Documentation Build (HTML)
188191
run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
189-
- uses: actions/upload-artifact@v3
192+
- uses: actions/upload-artifact@v4
190193
with:
191-
name: docs
194+
name: docs-html
192195
path: _build/html
193196
- name: Test Documentation Build (LaTeX/PDF)
194197
run: |
195198
make latexpdf
196-
- uses: actions/upload-artifact@v3
199+
- uses: actions/upload-artifact@v4
197200
with:
198-
name: docs
201+
name: docs-latexpdf
199202
path: _build/latex
200203
- name: Upload to S3
201204
uses: ./.github/actions/upload_aws
@@ -260,24 +263,25 @@ jobs:
260263
which python; python --version; python -c "import cascadetoml"
261264
which python3; python3 --version; python3 -c "import cascadetoml"
262265
- name: Set up repository
263-
uses: actions/checkout@v3
266+
uses: actions/checkout@v4
264267
with:
265268
submodules: false
269+
show-progress: false
266270
fetch-depth: 1
267271
- name: Set up submodules
268272
uses: ./.github/actions/deps/submodules
269273
- name: build mpy-cross
270-
run: make -j2 -C mpy-cross
274+
run: make -j4 -C mpy-cross
271275
- name: build rp2040
272-
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
273277
- name: build samd21
274-
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
275279
- name: build samd51
276-
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
277281
- name: build nrf
278-
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
279283
- name: build stm
280-
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
281285
# I gave up trying to do esp builds on windows when I saw
282286
# ERROR: Platform MINGW64_NT-10.0-17763-x86_64 appears to be unsupported
283287
# https://github.com/espressif/esp-idf/issues/7062

‎.github/workflows/create-website-pr.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ jobs:
1717
env:
1818
GITHUB_CONTEXT: ${{ toJson(github) }}
1919
- name: Set up repository
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
with:
2222
submodules: false
23+
show-progress: false
2324
fetch-depth: 1
2425
- name: Set up python
25-
uses: actions/setup-python@v4
26+
uses: actions/setup-python@v5
2627
with:
2728
python-version: 3.x
2829
- name: Set up submodules

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: |
4343
> custom-build && git add custom-build
4444
- name: Set up python
45-
uses: actions/setup-python@v4
45+
uses: actions/setup-python@v5
4646
with:
4747
python-version: 3.x
4848
- name: Set up port
@@ -81,10 +81,10 @@ 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
87-
uses: actions/upload-artifact@v3
87+
uses: actions/upload-artifact@v4
8888
with:
8989
name: ${{ inputs.board }}-${{ inputs.language }}-${{ inputs.version }}${{ inputs.flags != '' && '-custom' || '' }}${{ inputs.debug && '-debug' || '' }}
9090
path: ports/${{ steps.set-up-port.outputs.port }}/build-${{ inputs.board }}/firmware.*

‎.github/workflows/pre-commit.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ jobs:
1717
runs-on: ubuntu-22.04
1818
steps:
1919
- name: Set up repository
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
with:
2222
submodules: false
23+
show-progress: false
2324
fetch-depth: 1
2425
- name: Set up python
25-
uses: actions/setup-python@v4
26+
uses: actions/setup-python@v5
2627
with:
2728
python-version: 3.x
2829
- name: Set up submodules
@@ -40,7 +41,7 @@ jobs:
4041
run: git diff > ~/pre-commit.patch
4142
- name: Upload patch
4243
if: failure()
43-
uses: actions/upload-artifact@v3
44+
uses: actions/upload-artifact@v4
4445
with:
4546
name: patch
4647
path: ~/pre-commit.patch

‎.github/workflows/run-tests.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@ jobs:
2424
TEST_native_mpy: --via-mpy --emit native -d basics float micropython
2525
steps:
2626
- name: Set up repository
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828
with:
2929
submodules: false
30+
show-progress: false
3031
fetch-depth: 1
3132
- name: Set up python
32-
uses: actions/setup-python@v4
33+
uses: actions/setup-python@v5
3334
with:
3435
python-version: 3.8
3536
- name: Set up submodules
@@ -44,12 +45,12 @@ jobs:
4445
with:
4546
cp-version: ${{ inputs.cp-version }}
4647
- name: Build unix port
47-
run: make -C ports/unix VARIANT=coverage -j2
48+
run: make -C ports/unix VARIANT=coverage -j4
4849
- name: Run tests
49-
run: ./run-tests.py -j2 ${{ env[format('TEST_{0}', matrix.test)] }}
50+
run: ./run-tests.py -j4 ${{ env[format('TEST_{0}', matrix.test)] }}
5051
working-directory: tests
5152
- name: Print failure info
52-
run: ./run-tests.py -j2 --print-failures
53+
run: ./run-tests.py -j4 --print-failures
5354
if: failure()
5455
working-directory: tests
5556
- name: Build native modules

0 commit comments

Comments
 (0)
0