No more macos-12 runners, minimum for macos-amd64 is now macos-13

eregon · eregon · commit 2e3487c00ef7 · 2024-12-06T22:29:00.000+01:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-12, macos-13, macos-14, macos-15, windows-2019, windows-2022 ]
+        os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-13, macos-14, macos-15, windows-2019, windows-2022 ]
         ruby: [
           '1.9', '2.0', '2.1', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', ruby-head,
           jruby, jruby-head,
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ The action works on these [GitHub-hosted runners](https://docs.github.com/en/act
 | Operating System | Supported |
 | ---------------- | --------- |
 | Ubuntu  | `ubuntu-20.04`, `ubuntu-22.04`, `ubuntu-24.04` |
-| macOS   | `macos-12` and newer versions |
+| macOS   | `macos-13` and newer versions |
 | Windows | `windows-2019`, `windows-2022` |
 
 The prebuilt releases are generated by [ruby-builder](https://github.com/ruby/ruby-builder)
diff --git a/dist/index.js b/dist/index.js
diff --git a/index.js b/index.js
@@ -173,7 +173,7 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, parsedVe
   // Well known version-platform combinations which do not work:
   if (engine === 'ruby' && platform.startsWith('macos') && os.arch() === 'arm64' && common.floatVersion(version) < 2.6) {
     throw new Error(`CRuby < 2.6 does not support macos-arm64.
-        Either use a newer Ruby version or use a macOS image running on amd64, e.g., macos-13 or macos-12.
+        Either use a newer Ruby version or use a macOS image running on amd64, e.g., macos-13.
         Note that GitHub changed the meaning of macos-latest from macos-12 (amd64) to macos-14 (arm64):
         https://github.blog/changelog/2024-04-01-macos-14-sonoma-is-generally-available-and-the-latest-macos-runner-image/
 
diff --git a/ruby-builder.js b/ruby-builder.js
@@ -54,12 +54,6 @@ export async function install(platform, engine, version) {
     await downloadAndExtract(platform, engine, version, rubyPrefix)
   }
 
-  // https://github.com/oracle/truffleruby/issues/3390
-  if (engine.startsWith('truffleruby') && common.floatVersion(version) >= 24.0 && !common.isSelfHostedRunner() && common.getOSNameVersionArch() === 'macos-12-x64') {
-    console.log('Setting MACOSX_DEPLOYMENT_TARGET=11.0 to workaround bug in XCode 14.2 linker not respecting RTLD_LAZY, see https://github.com/oracle/truffleruby/issues/3390')
-    core.exportVariable('MACOSX_DEPLOYMENT_TARGET', '11.0')
-  }
-
   return rubyPrefix
 }
 

Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,6 @@ export async function install(platform, engine, version) {`
`54`	`54`	`await downloadAndExtract(platform, engine, version, rubyPrefix)`
`55`	`55`	`}`
`56`	`56`
`57`		`- // https://github.com/oracle/truffleruby/issues/3390`
`58`		`- if (engine.startsWith('truffleruby') && common.floatVersion(version) >= 24.0 && !common.isSelfHostedRunner() && common.getOSNameVersionArch() === 'macos-12-x64') {`
`59`		`- console.log('Setting MACOSX_DEPLOYMENT_TARGET=11.0 to workaround bug in XCode 14.2 linker not respecting RTLD_LAZY, see https://github.com/oracle/truffleruby/issues/3390')`
`60`		`- core.exportVariable('MACOSX_DEPLOYMENT_TARGET', '11.0')`
`61`		`- }`
`62`		`-`
`63`	`57`	`return rubyPrefix`
`64`	`58`	`}`
`65`	`59`