diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 41f129325333..a1b8bb15d0ae 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -19,6 +19,11 @@ jobs: with: submodules: recursive + # MoltenVK's build process breaks on Python 3.12 + - uses: actions/setup-python@v4 + with: + python-version: '3.11' + - name: Install Packages env: HOMEBREW_NO_INSTALL_CLEANUP: 1 diff --git a/.github/workflows/scripts/macos/build-dependencies.sh b/.github/workflows/scripts/macos/build-dependencies.sh index ad48e1640fc0..23ec3e477d4b 100755 --- a/.github/workflows/scripts/macos/build-dependencies.sh +++ b/.github/workflows/scripts/macos/build-dependencies.sh @@ -5,8 +5,9 @@ set -e export MACOSX_DEPLOYMENT_TARGET=10.15 INSTALLDIR="$HOME/deps" NPROCS="$(getconf _NPROCESSORS_ONLN)" -SDL=SDL2-2.26.0 -QT=6.2.4 +SDL=SDL2-2.28.5 +QT=6.2.7 +QT_SUFFIX=-opensource mkdir deps-build cd deps-build @@ -17,17 +18,17 @@ export CFLAGS="-I$INSTALLDIR/include -Os $CFLAGS" export CXXFLAGS="-I$INSTALLDIR/include -Os $CXXFLAGS" cat > SHASUMS <