Skip to content

Commit 25245bc

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/master' into stm32-docfix
2 parents 3c50098 + 1a71c8c commit 25245bc

601 files changed

Lines changed: 27912 additions & 6074 deletions

File tree

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 92 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,29 @@ jobs:
1616
env:
1717
GITHUB_CONTEXT: ${{ toJson(github) }}
1818
run: echo "$GITHUB_CONTEXT"
19-
- name: Set up Python 3.5
19+
- uses: actions/checkout@v2
20+
with:
21+
submodules: true
22+
fetch-depth: 0
23+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
24+
- run: git submodule sync
25+
- run: git submodule foreach git remote -v
26+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
27+
- name: CircuitPython version
28+
run: git describe --dirty --tags
29+
- name: Set up Python 3.8
2030
uses: actions/setup-python@v1
2131
with:
22-
python-version: 3.5
32+
python-version: 3.8
2333
- name: Install deps
2434
run: |
2535
sudo apt-get install -y eatmydata
2636
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
27-
pip install requests sh click setuptools cpp-coveralls Sphinx sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
37+
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
2838
- name: Versions
2939
run: |
3040
gcc --version
3141
python3 --version
32-
- uses: actions/checkout@v1
33-
with:
34-
submodules: true
35-
- name: CircuitPython version
36-
run: git describe --dirty --always --tags
3742
- name: Build mpy-cross
3843
run: make -C mpy-cross -j2
3944
- name: Build unix port
@@ -42,7 +47,7 @@ jobs:
4247
make -C ports/unix -j2
4348
make -C ports/unix coverage -j2
4449
- name: Test all
45-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1
50+
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1
4651
working-directory: tests
4752
- name: Print failure info
4853
run: |
@@ -54,10 +59,10 @@ jobs:
5459
working-directory: tests
5560
if: failure()
5661
- name: Native Tests
57-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native
62+
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native
5863
working-directory: tests
5964
- name: mpy Tests
60-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
65+
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
6166
working-directory: tests
6267
- name: Docs
6368
run: sphinx-build -E -W -b html . _build/html
@@ -103,11 +108,16 @@ jobs:
103108
gcc --version
104109
python3 --version
105110
msgfmt --version
106-
- uses: actions/checkout@v1
111+
- uses: actions/checkout@v2
107112
with:
108113
submodules: true
114+
fetch-depth: 0
115+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
116+
- run: git submodule sync
117+
- run: git submodule foreach git remote -v
118+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
109119
- name: CircuitPython version
110-
run: git describe --dirty --always --tags
120+
run: git describe --dirty --tags
111121
- name: Build mpy-cross
112122
run: make -C mpy-cross -j2
113123
- uses: actions/upload-artifact@v1.0.0
@@ -122,14 +132,20 @@ jobs:
122132
fail-fast: false
123133
matrix:
124134
board:
135+
- "8086_commander"
136+
- "TG-Watch02A"
125137
- "aramcon_badge_2019"
126138
- "arduino_mkr1300"
127139
- "arduino_mkrzero"
128140
- "arduino_nano_33_ble"
141+
- "arduino_nano_33_iot"
129142
- "arduino_zero"
130143
- "bast_pro_mini_m0"
144+
- "bdmicro_vina_m0"
131145
- "capablerobot_usbhub"
132146
- "catwan_usbstick"
147+
- "circuitbrains_basic_m0"
148+
- "circuitbrains_deluxe_m4"
133149
- "circuitplayground_bluefruit"
134150
- "circuitplayground_express"
135151
- "circuitplayground_express_crickit"
@@ -144,6 +160,8 @@ jobs:
144160
- "electronut_labs_blip"
145161
- "electronut_labs_papyr"
146162
- "escornabot_makech"
163+
- "espruino_pico"
164+
- "espruino_wifi"
147165
- "feather_bluefruit_sense"
148166
- "feather_m0_adalogger"
149167
- "feather_m0_basic"
@@ -153,6 +171,7 @@ jobs:
153171
- "feather_m0_rfm9x"
154172
- "feather_m0_supersized"
155173
- "feather_m4_express"
174+
- "feather_m7_1011"
156175
- "feather_mimxrt1011"
157176
- "feather_mimxrt1062"
158177
- "feather_nrf52840_express"
@@ -180,6 +199,9 @@ jobs:
180199
- "mini_sam_m4"
181200
- "monster_m4sk"
182201
- "ndgarage_ndbit6"
202+
- "nfc_copy_cat"
203+
- "nucleo_f767zi"
204+
- "nucleo_h743zi_2"
183205
- "ohs2020_badge"
184206
- "openbook_m4"
185207
- "particle_argon"
@@ -194,6 +216,7 @@ jobs:
194216
- "pybadge"
195217
- "pybadge_airlift"
196218
- "pyboard_v11"
219+
- "pycubed"
197220
- "pygamer"
198221
- "pygamer_advance"
199222
- "pyportal"
@@ -212,27 +235,32 @@ jobs:
212235
- "sparkfun_redboard_turbo"
213236
- "sparkfun_samd21_dev"
214237
- "sparkfun_samd21_mini"
238+
- "sparkfun_samd51_thing_plus"
215239
- "spresense"
216240
- "stm32f411ce_blackpill"
217241
- "stm32f411ve_discovery"
218242
- "stm32f412zg_discovery"
243+
- "stm32f4_discovery"
219244
- "stringcar_m0_express"
220245
- "teensy40"
221246
- "teknikio_bluebird"
247+
- "thunderpack"
222248
- "trellis_m4_express"
223249
- "trinket_m0"
224250
- "trinket_m0_haxpress"
251+
- "uartlogger2"
225252
- "uchip"
226253
- "ugame10"
254+
- "winterbloom_big_honking_button"
227255
- "winterbloom_sol"
228256
- "xinabox_cc03"
229257
- "xinabox_cs11"
230258

231259
steps:
232-
- name: Set up Python 3.5
260+
- name: Set up Python 3.8
233261
uses: actions/setup-python@v1
234262
with:
235-
python-version: 3.5
263+
python-version: 3.8
236264
- name: Install deps
237265
run: |
238266
sudo apt-get install -y gettext
@@ -244,9 +272,14 @@ jobs:
244272
gcc --version
245273
arm-none-eabi-gcc --version
246274
python3 --version
247-
- uses: actions/checkout@v1
275+
- uses: actions/checkout@v2
248276
with:
249277
submodules: true
278+
fetch-depth: 0
279+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
280+
- run: git submodule sync
281+
- run: git submodule foreach git remote -v
282+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
250283
- name: mpy-cross
251284
run: make -C mpy-cross -j2
252285
- name: build
@@ -264,13 +297,49 @@ jobs:
264297
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
265298
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
266299
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
267-
- name: Install upload deps
300+
301+
build-riscv:
302+
runs-on: ubuntu-16.04
303+
needs: test
304+
strategy:
305+
fail-fast: false
306+
matrix:
307+
board:
308+
- "fomu"
309+
310+
steps:
311+
- name: Set up Python 3.8
312+
uses: actions/setup-python@v1
313+
with:
314+
python-version: 3.8
315+
- name: Install deps
268316
run: |
269-
pip install uritemplate
270-
- name: Upload to Release
271-
run: "[ -z \"$ADABOT_GITHUB_ACCESS_TOKEN\" ] || python3 -u upload_release_files.py"
317+
sudo apt-get install -y gettext
318+
pip install requests sh click setuptools awscli
319+
wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
320+
sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
321+
- name: Versions
322+
run: |
323+
gcc --version
324+
riscv64-unknown-elf-gcc --version
325+
python3 --version
326+
- uses: actions/checkout@v1
327+
with:
328+
submodules: true
329+
- name: mpy-cross
330+
run: make -C mpy-cross -j2
331+
- name: build
332+
run: python3 -u build_release_files.py
272333
working-directory: tools
273334
env:
274-
UPLOAD_URL: ${{ github.event.release.upload_url }}
275-
ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.BLINKA_GITHUB_ACCESS_TOKEN }}
276-
if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')
335+
BOARDS: ${{ matrix.board }}
336+
- uses: actions/upload-artifact@v1.0.0
337+
with:
338+
name: ${{ matrix.board }}
339+
path: bin/${{ matrix.board }}
340+
- name: Upload to S3
341+
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
342+
env:
343+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
344+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
345+
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))

‎.github/workflows/create_website_pr.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,25 @@ jobs:
1212
env:
1313
GITHUB_CONTEXT: ${{ toJson(github) }}
1414
run: echo "$GITHUB_CONTEXT"
15-
- name: Set up Python 3.5
15+
- name: Set up Python 3.8
1616
uses: actions/setup-python@v1
1717
with:
18-
python-version: 3.5
18+
python-version: 3.8
1919
- name: Install deps
2020
run: |
2121
pip install requests sh click
2222
- name: Versions
2323
run: |
2424
gcc --version
2525
python3 --version
26-
- uses: actions/checkout@v1
26+
- uses: actions/checkout@v2
2727
with:
2828
submodules: true
29+
fetch-depth: 0
30+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
31+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
2932
- name: CircuitPython version
30-
run: git describe --dirty --always --tags
33+
run: git describe --dirty --tags
3134
- name: Website
3235
run: python3 build_board_info.py
3336
working-directory: tools

‎.gitmodules‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
[submodule "tools/python-semver"]
3030
path = tools/python-semver
3131
url = https://github.com/k-bx/python-semver.git
32-
[submodule "lib/stm32lib"]
33-
path = lib/stm32lib
34-
url = https://github.com/micropython/stm32lib
35-
branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0
3632
[submodule "atmel-samd/asf4"]
3733
path = ports/atmel-samd/asf4
3834
url = https://github.com/adafruit/asf4.git
@@ -96,9 +92,6 @@
9692
[submodule "frozen/circuitpython-stage"]
9793
path = frozen/circuitpython-stage
9894
url = https://github.com/python-ugame/circuitpython-stage.git
99-
[submodule "ports/stm32f4/stm32f4"]
100-
path = ports/stm32f4/stm32f4
101-
url = https://github.com/adafruit/stm32f4.git
10295
[submodule "ports/cxd56/spresense-exported-sdk"]
10396
path = ports/cxd56/spresense-exported-sdk
10497
url = https://github.com/sonydevworld/spresense-exported-sdk.git
@@ -111,3 +104,21 @@
111104
[submodule "ports/mimxrt10xx/sdk"]
112105
path = ports/mimxrt10xx/sdk
113106
url = https://github.com/adafruit/MIMXRT10xx_SDK
107+
[submodule "frozen/Adafruit_CircuitPython_Register"]
108+
path = frozen/Adafruit_CircuitPython_Register
109+
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
110+
[submodule "extmod/ulab"]
111+
path = extmod/ulab
112+
url = https://github.com/v923z/micropython-ulab
113+
[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"]
114+
path = frozen/Adafruit_CircuitPython_ESP32SPI
115+
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI
116+
[submodule "frozen/Adafruit_CircuitPython_Requests"]
117+
path = frozen/Adafruit_CircuitPython_Requests
118+
url = https://github.com/adafruit/Adafruit_CircuitPython_Requests
119+
[submodule "ports/stm/st_driver"]
120+
path = ports/stm/st_driver
121+
url = https://github.com/hathach/st_driver.git
122+
[submodule "lib/protomatter"]
123+
path = lib/protomatter
124+
url = https://github.com/adafruit/Adafruit_Protomatter

0 commit comments

Comments
 (0)