8000 update mpy-cross macOS build to macos 11; make macos mpy-cross names … · squix78/circuitpython@30ac9a4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 30ac9a4

Browse files
dhalbertdhalbert
committed
update mpy-cross macOS build to macos 11; make macos mpy-cross names consistent
1 parent 4a5790b commit 30ac9a4

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

‎.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143

144144

145145
mpy-cross-mac:
146-
runs-on: macos-10.15
146+
runs-on: macos-11
147147
steps:
148148
- name: Dump GitHub context
149149
env:
@@ -176,27 +176,27 @@ jobs:
176176
run: make -C mpy-cross -j2
177177
- uses: actions/upload-artifact@v2
178178
with:
179-
name: mpy-cross-macos-catalina
179+
name: mpy-cross-macos-11-x64
180180
path: mpy-cross/mpy-cross
181181
- name: Select SDK for M1 build
182182
run: sudo xcode-select -switch /Applications/Xcode_12.3.app
183183
- name: Build mpy-cross (arm64)
184184
run: make -C mpy-cross -j2 -f Makefile.m1 V=2
185185
- uses: actions/upload-artifact@v2
186186
with:
187-
name: mpy-cross-macos-bigsur-arm64
187+
name: mpy-cross-macos-11-arm64
188188
path: mpy-cross/mpy-cross-arm64
189189
- name: Make universal binary
190-
run: lipo -create -output mpy-cross-macos-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
190+
run: lipo -create -output mpy-cross-macos-11-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
191191
- uses: actions/upload-artifact@v2
192192
with:
193-
name: mpy-cross-macos-universal
194-
path: mpy-cross-macos-universal
193+
name: mpy-cross-macos-11-universal
194+
path: mpy-cross-macos-11-universal
195195
- name: Upload mpy-cross build to S3
196196
run: |
197-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-universal-${{ env.CP_VERSION }} --no-progress --region us-east-1
198-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-bigsur-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
199-
[ -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
197+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
198+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
199+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
200200
env:
201201
AWS_PAGER: ''
202202
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
3717

0 commit comments

Comments
 (0)
0