Fix Apple M1 installation, add to CI (#1975)

.github/workflows/pull-request.yml

@@ -144,7 +144,10 @@ jobs:
 # Single build under macOS to ensure the Mac toolchain is good.
   build-mac:
     name: Mac
-    runs-on: macOS-12
+    strategy:
+      matrix:
+        os: [macOS-12, macOS-14]
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
       with:
@@ -165,6 +168,7 @@ jobs:
         mod: 500
         rem: 1
       run: |
+        uname -a
         cd pico-sdk
         git submodule update --init
         cd ..

package/package_pico_index.template.json

@@ -285,7 +285,7 @@
                "name": "pqt-picotool",
                "systems": [
                   {
-                     "host": "aarch64-apple-darwin",
+                     "host": "arm64-apple-darwin",
                      "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.picotool-f6fe6b7.240127.tar.gz",
                      "archiveFileName": "aarch64-apple-darwin20.4.picotool-f6fe6b7.240127.tar.gz",
                      "checksum": "SHA-256:40a07809925f642be73d221898dea76fb1e79556c2c5adff9e59c998b1416019",
@@ -347,7 +347,7 @@
                "name": "pqt-openocd",
                "systems": [
                   {
-                     "host": "aarch64-apple-darwin",
+                     "host": "arm64-apple-darwin",
                      "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.openocd-4d87f6dca.240127.tar.gz",
                      "archiveFileName": "aarch64-apple-darwin20.4.openocd-4d87f6dca.240127.tar.gz",
                      "checksum": "SHA-256:548c6f6c84bde688b54b5014f99e15490d2afc50c4f3e777015583f12efab5de",
@@ -457,6 +457,13 @@
                      "checksum": "SHA-256:01a5bf1fa264c6f04cfaadf4c6e9f6caaacb6833ef40104dfbe953fcdb9bca1c",
                      "size": "25494144"
                   },
+                  {
+                     "host": "arm64-apple-darwin",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.0.1-base/python3-macosx-portable.tar.gz",
+                     "archiveFileName": "python3-macosx-portable.tar.gz",
+                     "checksum": "SHA-256:01a5bf1fa264c6f04cfaadf4c6e9f6caaacb6833ef40104dfbe953fcdb9bca1c",
+                     "size": "25494144"
+                  },
                   {
                      "host": "x86_64-pc-linux-gnu",
                      "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.0.1-base/python3-via-env.tar.gz",
@@ -471,7 +478,7 @@
                "name": "pqt-gcc",
                "systems": [
                   {
-                     "host": "aarch64-apple-darwin",
+                     "host": "arm64-apple-darwin",
                      "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.arm-none-eabi-d04e724.240127.tar.gz",
                      "archiveFileName": "aarch64-apple-darwin20.4.arm-none-eabi-d04e724.240127.tar.gz",
                      "checksum": "SHA-256:f70431e62a1d64b43d8730911be6b6f18ece3b91a216ce6c40d5318ad263756f",
@@ -533,7 +540,7 @@
                "name": "pqt-elf2uf2",
                "systems": [
                   {
-                     "host": "aarch64-apple-darwin",
+                     "host": "arm64-apple-darwin",
                      "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.elf2uf2-6a7db34.240127.tar.gz",
                      "archiveFileName": "aarch64-apple-darwin20.4.elf2uf2-6a7db34.240127.tar.gz",
                      "checksum": "SHA-256:3fb12aa0d39bb03520a46ff5e3d0dbd0eb0df31843056f5dcd8b6fffa1d7ff86",
@@ -595,7 +602,7 @@
                "name": "pqt-pioasm",
                "systems": [
                   {
-                     "host": "aarch64-apple-darwin",
+                     "host": "arm64-apple-darwin",
                      "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.pioasm-6a7db34.240127.tar.gz",
                      "archiveFileName": "aarch64-apple-darwin20.4.pioasm-6a7db34.240127.tar.gz",
                      "checksum": "SHA-256:b325fdf8c2e7712e821049c68fc29dfac80bc492fb03c0fb3597de272ff42deb",
@@ -657,7 +664,7 @@
                "name": "pqt-mklittlefs",
                "systems": [
                   {
-                     "host": "aarch64-apple-darwin",
+                     "host": "arm64-apple-darwin",
                      "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.mklittlefs-6e2fa17.240127.tar.gz",
                      "archiveFileName": "aarch64-apple-darwin20.4.mklittlefs-6e2fa17.240127.tar.gz",
                      "checksum": "SHA-256:ad46da0560569a97edd11490829479e70aa3c53b4525c5a8f6ae154f2d41c0bb",

tests/common.sh

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