Skip to content

Commit 9742099

Browse files
osterwoodosterwood
committed
Merge remote-tracking branch 'origin/master' into capablerobot-usbhub
2 parents 137a4f8 + 85c7317 commit 9742099

File tree

1,860 files changed

+51719
-234295
lines changed

Some content is hidden

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

1,860 files changed

+51719
-234295
lines changed

‎.github/workflows/build.yml

Lines changed: 221 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,221 @@
1+
name: Build CI
2+
3+
on:
4+
push:
5+
pull_request:
6+
release:
7+
types: [published]
8+
check_suite:
9+
types: [rerequested]
10+
11+
jobs:
12+
test:
13+
runs-on: ubuntu-16.04
14+
steps:
15+
- name: Dump GitHub context
16+
env:
17+
GITHUB_CONTEXT: ${{ toJson(github) }}
18+
run: echo "$GITHUB_CONTEXT"
19+
- name: Set up Python 3.5
20+
uses: actions/setup-python@v1
21+
with:
22+
python-version: 3.5
23+
- name: Install deps
24+
run: |
25+
sudo apt-get install -y gettext librsvg2-bin
26+
pip install requests sh click setuptools cpp-coveralls Sphinx sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
27+
- name: Versions
28+
run: |
29+
gcc --version
30+
python3 --version
31+
- uses: actions/checkout@v1
32+
with:
33+
submodules: true
34+
- name: CircuitPython version
35+
run: git describe --dirty --always --tags
36+
- name: Build mpy-cross
37+
run: make -C mpy-cross -j2
38+
- name: Build unix port
39+
run: |
40+
make -C ports/unix deplibs -j2
41+
make -C ports/unix -j2
42+
make -C ports/unix coverage -j2
43+
- name: Test all
44+
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1
45+
working-directory: tests
46+
- name: Print failure info
47+
run: |
48+
for exp in *.exp;
49+
do testbase=$(basename $exp .exp);
50+
echo -e "\nFAILURE $testbase";
51+
diff -u $testbase.exp $testbase.out;
52+
done
53+
working-directory: tests
54+
if: failure()
55+
- name: Native Tests
56+
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native
57+
working-directory: tests
58+
- name: mpy Tests
59+
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
60+
working-directory: tests
61+
- name: Docs
62+
run: sphinx-build -E -W -b html . _build/html
63+
- name: Translations
64+
run: make check-translate
65+
- name: New boards check
66+
run: python3 -u ci_new_boards_check.py
67+
working-directory: tools
68+
69+
build-arm:
70+
runs-on: ubuntu-16.04
71+
needs: test
72+
strategy:
73+
fail-fast: false
74+
matrix:
75+
board:
76+
- "aramcon_badge_2019"
77+
- "arduino_mkr1300"
78+
- "arduino_mkrzero"
79+
- "arduino_nano_33_ble"
80+
- "arduino_zero"
81+
- "bast_pro_mini_m0"
82+
- "capablerobot_usbhub"
83+
- "catwan_usbstick"
84+
- "circuitplayground_bluefruit"
85+
- "circuitplayground_express"
86+
- "circuitplayground_express_crickit"
87+
- "circuitplayground_express_displayio"
88+
- "clue_nrf52840_express"
89+
- "cp32-m4"
90+
- "datalore_ip_m4"
91+
- "datum_distance"
92+
- "datum_imu"
93+
- "datum_light"
94+
- "datum_weather"
95+
- "electronut_labs_blip"
96+
- "electronut_labs_papyr"
97+
- "escornabot_makech"
98+
- "feather_m0_adalogger"
99+
- "feather_m0_basic"
100+
- "feather_m0_express"
101+
- "feather_m0_express_crickit"
102+
- "feather_m0_rfm69"
103+
- "feather_m0_rfm9x"
104+
- "feather_m0_supersized"
105+
- "feather_m4_express"
106+
- "feather_mimxrt1011"
107+
- "feather_mimxrt1062"
108+
- "feather_nrf52840_express"
109+
- "feather_radiofruit_zigbee"
110+
- "feather_stm32f405_express"
111+
- "gemma_m0"
112+
- "grandcentral_m4_express"
113+
- "hallowing_m0_express"
114+
- "hallowing_m4_express"
115+
- "imxrt1010_evk"
116+
- "itsybitsy_m0_express"
117+
- "itsybitsy_m4_express"
118+
- "itsybitsy_nrf52840_express"
119+
- "kicksat-sprite"
120+
- "makerdiary_nrf52840_mdk"
121+
- "makerdiary_nrf52840_mdk_usb_dongle"
122+
- "meowmeow"
123+
- "metro_m0_express"
124+
- "metro_m4_airlift_lite"
125+
- "metro_m4_express"
126+
- "metro_nrf52840_express"
127+
- "mini_sam_m4"
128+
- "monster_m4sk"
129+
- "ohs2020_badge"
130+
- "openbook_m4"
131+
- "particle_argon"
132+
- "particle_boron"
133+
- "particle_xenon"
134+
- "pca10056"
135+
- "pca10059"
136+
- "pewpew10"
137+
- "pewpew_m4"
138+
- "pirkey_m0"
139+
- "pyb_nano_v2"
140+
- "pybadge"
141+
- "pybadge_airlift"
142+
- "pyboard_v11"
143+
- "pygamer"
144+
- "pygamer_advance"
145+
- "pyportal"
146+
- "pyportal_titano"
147+
- "pyruler"
148+
- "robohatmm1_m4"
149+
- "sam32"
150+
- "seeeduino_xiao"
151+
- "serpente"
152+
- "shirtty"
153+
- "snekboard"
154+
- "sparkfun_lumidrive"
155+
- "sparkfun_nrf52840_mini"
156+
- "sparkfun_qwiic_micro_no_flash"
157+
- "sparkfun_qwiic_micro_with_flash"
158+
- "sparkfun_redboard_turbo"
159+
- "sparkfun_samd21_dev"
160+
- "sparkfun_samd21_mini"
161+
- "spresense"
162+
- "stm32f411ce_blackpill"
163+
- "stm32f411ve_discovery"
164+
- "stm32f412zg_discovery"
165+
- "stringcar_m0_express"
166+
- "teknikio_bluebird"
167+
- "trellis_m4_express"
168+
- "trinket_m0"
169+
- "trinket_m0_haxpress"
170+
- "uchip"
171+
- "ugame10"
172+
- "winterbloom_sol"
173+
- "xinabox_cc03"
174+
- "xinabox_cs11"
175+
176+
steps:
177+
- name: Set up Python 3.5
178+
uses: actions/setup-python@v1
179+
with:
180+
python-version: 3.5
181+
- name: Install deps
182+
run: |
183+
sudo apt-get install -y gettext
184+
pip install requests sh click setuptools awscli
185+
wget https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
186+
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
187+
- name: Versions
188+
run: |
189+
gcc --version
190+
arm-none-eabi-gcc --version
191+
python3 --version
192+
- uses: actions/checkout@v1
193+
with:
194+
submodules: true
195+
- name: mpy-cross
196+
run: make -C mpy-cross -j2
197+
- name: build
198+
run: python3 -u build_release_files.py
199+
working-directory: tools
200+
env:
201+
BOARDS: ${{ matrix.board }}
202+
- uses: actions/[email protected]
203+
with:
204+
name: ${{ matrix.board }}
205+
path: bin/${{ matrix.board }}
206+
- name: Upload to S3
207+
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
208+
env:
209+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
210+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
211+
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
212+
- name: Install upload deps
213+
run: |
214+
pip install uritemplate
215+
- name: Upload to Release
216+
run: "[ -z \"$ADABOT_GITHUB_ACCESS_TOKEN\" ] || python3 -u upload_release_files.py"
217+
working-directory: tools
218+
env:
219+
UPLOAD_URL: ${{ github.event.release.upload_url }}
220+
ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.BLINKA_GITHUB_ACCESS_TOKEN }}
221+
if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')

‎.github/workflows/create_website_pr.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Update CircuitPython.org
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
website:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Dump GitHub context
12+
env:
13+
GITHUB_CONTEXT: ${{ toJson(github) }}
14+
run: echo "$GITHUB_CONTEXT"
15+
- name: Set up Python 3.5
16+
uses: actions/setup-python@v1
17+
with:
18+
python-version: 3.5
19+
- name: Install deps
20+
run: |
21+
pip install requests sh click
22+
- name: Versions
23+
run: |
24+
gcc --version
25+
python3 --version
26+
- uses: actions/checkout@v1
27+
with:
28+
submodules: true
29+
- name: CircuitPython version
30+
run: git describe --dirty --always --tags
31+
- name: Website
32+
run: python3 build_board_info.py
33+
working-directory: tools
34+
env:
35+
RELEASE_TAG: ${{ github.event.release.tag_name }}
36+
ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.BLINKA_GITHUB_ACCESS_TOKEN }}
37+
if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ TAGS
6565
*~
6666

6767
*.DS_Store
68+
**/*.DS_Store
69+
*.icloud
6870

6971
# POEdit mo files
7072
####################

‎.gitmodules

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
[submodule "lib/tinyusb"]
7777
path = lib/tinyusb
7878
url = https://github.com/hathach/tinyusb.git
79-
branch = develop
79+
branch = master
80+
fetchRecurseSubmodules = false
8081
[submodule "tools/huffman"]
8182
path = tools/huffman
8283
url = https://github.com/tannewt/huffman.git
@@ -98,3 +99,15 @@
9899
[submodule "ports/stm32f4/stm32f4"]
99100
path = ports/stm32f4/stm32f4
100101
url = https://github.com/adafruit/stm32f4.git
102+
[submodule "ports/cxd56/spresense-exported-sdk"]
103+
path = ports/cxd56/spresense-exported-sdk
104+
url = https://github.com/sonydevworld/spresense-exported-sdk.git
105+
[submodule "frozen/Adafruit_CircuitPython_SD"]
106+
path = frozen/Adafruit_CircuitPython_SD
107+
url = https://github.com/adafruit/Adafruit_CircuitPython_SD.git
108+
[submodule "lib/mp3"]
109+
path = lib/mp3
110+
url = https://github.com/adafruit/Adafruit_MP3
111+
[submodule "ports/mimxrt10xx/sdk"]
112+
path = ports/mimxrt10xx/sdk
113+
url = https://github.com/arturo182/MIMXRT10xx_SDK

0 commit comments

Comments
 (0)