diff --git a/.github/scripts/environment.sh b/.github/scripts/environment.sh index cc6d1619f..792eb00e5 100644 --- a/.github/scripts/environment.sh +++ b/.github/scripts/environment.sh @@ -104,6 +104,10 @@ case "$RUNNER_OS" in --enable-libbacktrace \ --enable-syphon \ " + macos_major=$(sw_vers -productVersion | cut -d. -f1) + if [ "$macos_major" -ge 15 ]; then + FEATURES="$FEATURES --disable-screen" + fi ;; Windows) FEATURES="$FEATURES $CUDA_FEATURES --enable-dshow --enable-spout --enable-wasapi" diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 15db41f32..a08fa352a 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -144,7 +144,7 @@ jobs: needs: prepare strategy: matrix: - os: [macos-13, macos-14] + os: [macos-15-intel, macos-14] fail-fast: false runs-on: ${{ matrix.os }} env: