Skip to content

Commit 8fe512c

Browse files
committed
Merge remote-tracking branch 'adafruit/master' into lower_power
2 parents 4b063ae + f47b964 commit 8fe512c

135 files changed

Lines changed: 5934 additions & 929 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: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ jobs:
122122
fail-fast: false
123123
matrix:
124124
board:
125+
- "8086_commander"
125126
- "TG-Watch02A"
126127
- "aramcon_badge_2019"
127128
- "arduino_mkr1300"
@@ -130,6 +131,7 @@ jobs:
130131
- "arduino_nano_33_iot"
131132
- "arduino_zero"
132133
- "bast_pro_mini_m0"
134+
- "bdmicro_vina_m0"
133135
- "capablerobot_usbhub"
134136
- "catwan_usbstick"
135137
- "circuitbrains_basic_m0"
@@ -229,11 +231,14 @@ jobs:
229231
- "stringcar_m0_express"
230232
- "teensy40"
231233
- "teknikio_bluebird"
234+
- "thunderpack"
232235
- "trellis_m4_express"
233236
- "trinket_m0"
234237
- "trinket_m0_haxpress"
238+
- "uartlogger2"
235239
- "uchip"
236240
- "ugame10"
241+
- "winterbloom_big_honking_button"
237242
- "winterbloom_sol"
238243
- "xinabox_cc03"
239244
- "xinabox_cs11"
@@ -274,3 +279,49 @@ jobs:
274279
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
275280
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
276281
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
282+
283+
build-riscv:
284+
runs-on: ubuntu-16.04
285+
needs: test
286+
strategy:
287+
fail-fast: false
288+
matrix:
289+
board:
290+
- "fomu"
291+
292+
steps:
293+
- name: Set up Python 3.5
294+
uses: actions/setup-python@v1
295+
with:
296+
python-version: 3.5
297+
- name: Install deps
298+
run: |
299+
sudo apt-get install -y gettext
300+
pip install requests sh click setuptools awscli
301+
wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
302+
sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
303+
- name: Versions
304+
run: |
305+
gcc --version
306+
riscv64-unknown-elf-gcc --version
307+
python3 --version
308+
- uses: actions/checkout@v1
309+
with:
310+
submodules: true
311+
- name: mpy-cross
312+
run: make -C mpy-cross -j2
313+
- name: build
314+
run: python3 -u build_release_files.py
315+
working-directory: tools
316+
env:
317+
BOARDS: ${{ matrix.board }}
318+
- uses: actions/upload-artifact@v1.0.0
319+
with:
320+
name: ${{ matrix.board }}
321+
path: bin/${{ matrix.board }}
322+
- name: Upload to S3
323+
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
324+
env:
325+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
326+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
327+
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(BASEOPTS)
3636
# the i18n builder cannot share the environment and doctrees with the others
3737
I18NSPHINXOPTS = $(BASEOPTS)
3838

39-
TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/mimxrt10xx ports/nrf ports/stm32f4 py shared-bindings shared-module supervisor
39+
TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/mimxrt10xx ports/nrf ports/stm py shared-bindings shared-module supervisor
4040

4141
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext stubs
4242

conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
"ports/atmel-samd/tools",
124124
"ports/cxd56/mkspk",
125125
"ports/cxd56/spresense-exported-sdk",
126+
"ports/litex/hw",
126127
"ports/minimal",
127128
"ports/mimxrt10xx/peripherals",
128129
"ports/mimxrt10xx/sdk",

0 commit comments

Comments
 (0)