Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix macOS CI builds #493

Merged
merged 3 commits into from
Apr 24, 2024
Merged

Fix macOS CI builds #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c41ce2
Fix macOS CI builds by force-installing Sphinx
thp Apr 24, 2024
1b1b7c6
macOS: Build on arm64
thp Apr 24, 2024
9cfa056
CI: Set macos-13 to build for x86_64
thp Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion scripts/install_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading