Skip to content

Commit d69f081

Browse files
jeplerjepler
committed
Merge remote-tracking branch 'origin/main' into blm_badge
2 parents 5746499 + 531c1e0 commit d69f081

41 files changed

Lines changed: 3570 additions & 716 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: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
sudo apt-get install -y eatmydata
3939
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
40-
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort black
40+
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort black awscli
4141
- name: Versions
4242
run: |
4343
gcc --version
@@ -86,24 +86,32 @@ jobs:
8686
working-directory: tools
8787
- name: Build mpy-cross.static-raspbian
8888
run: make -C mpy-cross -j2 -f Makefile.static-raspbian
89-
- uses: actions/upload-artifact@v1.0.0
89+
- uses: actions/upload-artifact@v2
9090
with:
9191
name: mpy-cross.static-raspbian
9292
path: mpy-cross/mpy-cross.static-raspbian
93-
9493
- name: Build mpy-cross.static
9594
run: make -C mpy-cross -j2 -f Makefile.static
96-
- uses: actions/upload-artifact@v1.0.0
95+
- uses: actions/upload-artifact@v2
9796
with:
9897
name: mpy-cross.static-amd64-linux
9998
path: mpy-cross/mpy-cross.static
100-
10199
- name: Build mpy-cross.static-mingw
102100
run: make -C mpy-cross -j2 -f Makefile.static-mingw
103-
- uses: actions/upload-artifact@v1.0.0
101+
- uses: actions/upload-artifact@v2
104102
with:
105103
name: mpy-cross.static-x64-windows
106104
path: mpy-cross/mpy-cross.static.exe
105+
- name: Upload mpy-cross builds to S3
106+
run: |
107+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-raspbian s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-raspbian-${{ env.CP_VERSION }} --no-progress --region us-east-1
108+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-amd64-linux-${{ env.CP_VERSION }} --no-progress --region us-east-1
109+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static.exe s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-x64-windows-${{ env.CP_VERSION }}.exe --no-progress --region us-east-1
110+
env:
111+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
112+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
113+
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
114+
107115

108116
mpy-cross-mac:
109117
runs-on: macos-10.15
@@ -112,9 +120,9 @@ jobs:
112120
env:
113121
GITHUB_CONTEXT: ${{ toJson(github) }}
114122
run: echo "$GITHUB_CONTEXT"
115-
- name: Make gettext programs available
123+
- name: Install dependencies
116124
run: |
117-
brew install gettext
125+
brew install gettext awscli
118126
echo "::set-env name=PATH::/usr/local/opt/gettext/bin:$PATH"
119127
- name: Versions
120128
run: |
@@ -127,13 +135,23 @@ jobs:
127135
fetch-depth: 0
128136
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
129137
- name: CircuitPython version
130-
run: git describe --dirty --tags
138+
run: |
139+
git describe --dirty --tags
140+
echo "::set-env name=CP_VERSION::$(git describe --dirty --tags)"
131141
- name: Build mpy-cross
132142
run: make -C mpy-cross -j2
133-
- uses: actions/upload-artifact@v1.0.0
143+
- uses: actions/upload-artifact@v2
134144
with:
135145
name: mpy-cross-macos-catalina
136146
path: mpy-cross/mpy-cross
147+
- name: Upload mpy-cross build to S3
148+
run: |
149+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-catalina-${{ env.CP_VERSION }} --no-progress --region us-east-1
150+
env:
151+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
152+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
153+
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
154+
137155

138156
build-arm:
139157
runs-on: ubuntu-18.04
@@ -317,7 +335,7 @@ jobs:
317335
working-directory: tools
318336
env:
319337
BOARDS: ${{ matrix.board }}
320-
- uses: actions/upload-artifact@v1.0.0
338+
- uses: actions/upload-artifact@v2
321339
with:
322340
name: ${{ matrix.board }}
323341
path: bin/${{ matrix.board }}
@@ -365,7 +383,7 @@ jobs:
365383
working-directory: tools
366384
env:
367385
BOARDS: ${{ matrix.board }}
368-
- uses: actions/upload-artifact@v1.0.0
386+
- uses: actions/upload-artifact@v2
369387
with:
370388
name: ${{ matrix.board }}
371389
path: bin/${{ matrix.board }}
@@ -445,7 +463,7 @@ jobs:
445463
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
446464
IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
447465
BOARDS: ${{ matrix.board }}
448-
- uses: actions/upload-artifact@v1.0.0
466+
- uses: actions/upload-artifact@v2
449467
with:
450468
name: ${{ matrix.board }}
451469
path: bin/${{ matrix.board }}

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ check-translate:
241241
stubs:
242242
@mkdir -p circuitpython-stubs
243243
@$(PYTHON) tools/extract_pyi.py shared-bindings/ $(STUBDIR)
244+
@$(PYTHON) tools/extract_pyi.py extmod/ulab/code/ $(STUBDIR)/ulab
244245
@$(PYTHON) tools/extract_pyi.py ports/atmel-samd/bindings $(STUBDIR)
245246
@$(PYTHON) setup.py -q sdist
246247

‎docs/requirements.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ recommonmark==0.6.0
33
sphinxcontrib-svg2pdfconverter==0.1.0
44
astroid
55
sphinx-autoapi
6+
isort
7+
black

‎extmod/ulab‎

‎lib/tinyusb‎

Submodule tinyusb updated 166 files

0 commit comments

Comments
 (0)