go back down to macos-13 for now

taisei-project · Oct 7, 2024 · 6ca949a · 6ca949a
1 parent 99396d9
commit 6ca949a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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-12
+    runs-on: macos-13
     steps:
     - name: Checkout Code
       uses: actions/checkout@v4

diff --git 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-12
+    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
@@ -1,7 +1,7 @@
 [constants]
 # apple silicon only supports macOS >=11.x, so just use that
 macos_min = '11.1'
-cflags = ['-mmacosx-version-min='+macos_min, '-arch', 'arm64', '-mcpu=apple-m1', '-fno-integrated-as']
+cflags = ['-mmacosx-version-min='+macos_min, '-arch', 'arm64', '-mcpu=apple-m1']
 ldflags = cflags
 
 [host_machine]

diff --git 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 = ['-mmacosx-version-min='+macos_min, '-arch', 'x86_64', '-fno-integrated-as']
+cflags = ['-mmacosx-version-min='+macos_min, '-arch', 'x86_64']
 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
@@ -1,6 +1,6 @@
 [constants]
 macos_min = '10.15'
-cflags = ['-mmacosx-version-min='+macos_min, '-arch', 'x86_64', '-fno-integrated-as']
+cflags = ['-mmacosx-version-min='+macos_min, '-arch', 'x86_64']
 # NOTE: might need to pass -sdk_version to the linker as well, not sure how that works...
 ldflags = cflags