Merge pull request #493 from thp/fix-ci

Fix macOS CI builds
thp · Apr 24, 2024 · 26e1446 · 26e1446
2 parents 48aeeaa + 9cfa056
commit 26e1446
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,12 +19,10 @@ jobs:
         include:
           - build_host: ubuntu-latest
             build_type: linux-native-gcc
-          - build_host: macos-latest
+          - build_host: macos-13
             build_type: macos-native-clang-x86_64
-          # Disabled until Github Actions gets support for M1 Macs.
-          # See also: https://github.com/actions/runner-images/issues/2187
-          #- build_host: macos-latest
-          #  build_type: macos-native-clang-arm64
+          - build_host: macos-latest
+            build_type: macos-native-clang-arm64
           - build_host: windows-latest
             build_type: windows-native-msvc-x64
     env:

diff --git a/scripts/install_dependencies.sh b/scripts/install_dependencies.sh
@@ -21,7 +21,7 @@ case "$UNAME" in
         brew update
         brew install --force cmake git libtool automake autoconf python libusb-compat sdl2 || true
         brew unlink libtool ; brew link --overwrite libtool
-        pip3 install --user sphinx
+        pip3 install --user --break-system-packages sphinx
         ;;
     MINGW64_NT-*)
         # Nothing to do, Windows OS