diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9fd3c1bb6..932e846c6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,7 +104,7 @@ jobs: macos-test-build: name: macOS (x64) if: "!contains(github.event.head_commit.message, '[skip ci]')" - runs-on: macos-14 + runs-on: macos-13 steps: - name: Checkout Code uses: actions/checkout@v4 @@ -119,11 +119,8 @@ jobs: - name: Install Tools run: > brew install - gcc - pkg-config docutils pygments - freetype2 libzip opusfile libvorbis diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6806b0597..d77b60fd3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -199,7 +199,7 @@ jobs: macos-release-build-universal: name: macOS (Universal) if: ${{ (github.event.inputs.macos-x64-arm64 || 'true') == 'true' }} - runs-on: macos-14 + runs-on: macos-13 steps: - name: Install Tools run: > diff --git a/misc/ci/macos-aarch64-build-release.ini b/misc/ci/macos-aarch64-build-release.ini index 9202110b1..8c5787e1d 100644 --- a/misc/ci/macos-aarch64-build-release.ini +++ b/misc/ci/macos-aarch64-build-release.ini @@ -1,7 +1,7 @@ [constants] # apple silicon only supports macOS >=11.x, so just use that macos_min = '11.1' -cflags = ['-Wl,-ld_classic', '-mmacosx-version-min='+macos_min, '-arch', 'arm64', '-mcpu=apple-m1', '-fno-integrated-as'] +cflags = ['-mmacosx-version-min='+macos_min, '-arch', 'arm64', '-mcpu=apple-m1', '-fno-integrated-as'] ldflags = cflags [host_machine] diff --git a/misc/ci/macos-x86_64-build-release.ini b/misc/ci/macos-x86_64-build-release.ini index 124c7485c..94491e2d1 100644 --- a/misc/ci/macos-x86_64-build-release.ini +++ b/misc/ci/macos-x86_64-build-release.ini @@ -1,6 +1,6 @@ [constants] macos_min = '10.15' -cflags = ['-Wl,-ld_classic', '-mmacosx-version-min='+macos_min, '-arch', 'x86_64', '-fno-integrated-as'] +cflags = ['-mmacosx-version-min='+macos_min, '-arch', 'x86_64', '-fno-integrated-as'] ldflags = cflags [host_machine] diff --git a/misc/ci/macos-x86_64-build-test-ci.ini b/misc/ci/macos-x86_64-build-test-ci.ini index b927fad17..7ac583725 100644 --- a/misc/ci/macos-x86_64-build-test-ci.ini +++ b/misc/ci/macos-x86_64-build-test-ci.ini @@ -1,6 +1,6 @@ [constants] macos_min = '10.15' -cflags = ['-Wl,-ld_classic', '-mmacosx-version-min='+macos_min, '-arch', 'x86_64', '-fno-integrated-as'] +cflags = ['-mmacosx-version-min='+macos_min, '-arch', 'x86_64', '-fno-integrated-as'] # NOTE: might need to pass -sdk_version to the linker as well, not sure how that works... ldflags = cflags