8000 Fix Apple M1 installation, add to CI (#1975) · LinusHeu/arduino-pico@f1170e9 · GitHub
[go: up one dir, main page]
10000 Skip to content

Commit f1170e9

Browse files
earlephilhowerearlephilhower
authored
Fix Apple M1 installation, add to CI (earlephilhower#1975)
1 parent 1bf41bc commit f1170e9

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

‎.github/workflows/pull-request.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,10 @@ jobs:
144144
# Single build under macOS to ensure the Mac toolchain is good.
145145
build-mac:
146146
name: Mac
147-
runs-on: macOS-12
147+
strategy:
148+
matrix:
149+
os: [macOS-12, macOS-14]
150+
runs-on: ${{ matrix.os }}
148151
steps:
149152
- uses: actions/checkout@v3
150153
with:
@@ -165,6 +168,7 @@ jobs:
165168
mod: 500
166169
rem: 1
167170
run: |
171+
uname -a
168172
cd pico-sdk
169173
git submodule update --init
170174
cd ..

‎package/package_pico_index.template.json

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
"name": "pqt-picotool",
286286
"systems": [
287287
{
288-
"host": "aarch64-apple-darwin",
288+
"host": "arm64-apple-darwin",
289289
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.picotool-f6fe6b7.240127.tar.gz",
290290
"archiveFileName": "aarch64-apple-darwin20.4.picotool-f6fe6b7.240127.tar.gz",
291291
"checksum": "SHA-256:40a07809925f642be73d221898dea76fb1e79556c2c5adff9e59c998b1416019",
@@ -347,7 +347,7 @@
347347
"name": "pqt-openocd",
348348
"systems": [
349349
{
350-
"host": "aarch64-apple-darwin",
350+
"host": "arm64-apple-darwin",
351351
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.openocd-4d87f6dca.240127.tar.gz",
352352
"archiveFileName": "aarch64-apple-darwin20.4.openocd-4d87f6dca.240127.tar.gz",
353353
"checksum": "SHA-256:548c6f6c84bde688b54b5014f99e15490d2afc50c4f3e777015583f12efab5de",
@@ -457,6 +457,13 @@
457457
"checksum": "SHA-256:01a5bf1fa264c6f04cfaadf4c6e9f6caaacb6833ef40104dfbe953fcdb9bca1c",
458458
"size": "25494144"
459459
},
460+
{
461+
"host": "arm64-apple-darwin",
462+
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.0.1-base/python3-macosx-portable.tar.gz",
463+
"archiveFileName": "python3-macosx-portable.tar.gz",
464+
"checksum": "SHA-256:01a5bf1fa264c6f04cfaadf4c6e9f6caaacb6833ef40104dfbe953fcdb9bca1c",
465+
"size": "25494144"
466+
},
460467
{
461468
"host": "x86_64-pc-linux-gnu",
462469
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.0.1-base/python3-via-env.tar.gz",
@@ -471,7 +478,7 @@
471478
"name": "pqt-gcc",
472479
"systems": [
473480
{
474-
"host": "aarch64-apple-darwin",
481+
"host": "arm64-apple-darwin",
475482
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.arm-none-eabi-d04e724.240127.tar.gz",
476483
"archiveFileName": "aarch64-apple-darwin20.4.arm-none-eabi-d04e724.240127.tar.gz",
477484
"checksum": "SHA-256:f70431e62a1d64b43d8730911be6b6f18ece3b91a216ce6c40d5318ad263756f",
@@ -533,7 +540,7 @@
533540
"name": "pqt-elf2uf2",
534541
"systems": [
535542
{
536-
"host": "aarch64-apple-darwin",
543+
"host": "arm64-apple-darwin",
537544
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.elf2uf2-6a7db34.240127.tar.gz",
538545
"archiveFileName": "aarch64-apple-darwin20.4.elf2uf2-6a7db34.240127.tar.gz",
539546
"checksum": "SHA-256:3fb12aa0d39bb03520a46ff5e3d0dbd0eb0df31843056f5dcd8b6fffa1d7ff86",
@@ -595,7 +602,7 @@
595602
"name": "pqt-pioasm",
596603
"systems": [
597604
{
598-
"host": "aarch64-apple-darwin",
605+
"host": "arm64-apple-darwin",
599606
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.pioasm-6a7db34.240127.tar.gz",
600607
"archiveFileName": "aarch64-apple-darwin20.4.pioasm-6a7db34.240127.tar.gz",
601608
"checksum": "SHA-256:b325fdf8c2e7712e821049c68fc29dfac80bc492fb03c0fb3597de272ff42deb",
@@ -657,7 +664,7 @@
657664
"name": "pqt-mklittlefs",
658665
"systems": [
659666
{
660-
"host": "aarch64-apple-darwin",
667+
"host": "arm64-apple-darwin",
661668
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.mklittlefs-6e2fa17.240127.tar.gz",
662669
"archiveFileName": "aarch64-apple-darwin20.4.mklittlefs-6e2fa17.240127.tar.gz",
663670
"checksum": "SHA-256:ad46da0560569a97edd11490829479e70aa3c53b4525c5a8f6ae154f2d41c0bb",

‎tests/common.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,6 @@ function install_ide()
178178
unzip -q ${core_path}/tools/dist/arduino-windows.zip
179179
mv arduino-${idever} arduino-distrib
180180
elif [ "$MACOSX" = "1" ]; then
181-
# MACOS only has next-to-obsolete Python2 installed. Install Python 3 from python.org
182-
wget -q https://www.python.org/ftp/python/3.7.4/python-3.7.4-macosx10.9.pkg
183-
sudo installer -pkg python-3.7.4-macosx10.9.pkg -target /
184-
# Install the Python3 certificates, because SSL connections fail w/o them and of course they aren't installed by default.
185-
( cd "/Applications/Python 3.7/" && sudo "./Install Certificates.command" )
186181
# Hack to place arduino-builder in the same spot as sane OSes
187182
test -r ${core_path}/tools/dist/arduino-macos.zip || wget -q -O ${core_path}/tools/dist/arduino-macos.zip "${ideurl}-macosx.zip"
188183
unzip -q ${core_path}/tools/dist/arduino-macos.zip

0 commit comments

Comments
 (0)
0