Skip to content

Commit 2e3487c

Browse files
committed
No more macos-12 runners, minimum for macos-amd64 is now macos-13
1 parent 6825c76 commit 2e3487c

File tree

5 files changed

+4
-16
lines changed

5 files changed

+4
-16
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-12, macos-13, macos-14, macos-15, windows-2019, windows-2022 ]
20+
os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-13, macos-14, macos-15, windows-2019, windows-2022 ]
2121
ruby: [
2222
'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,
2323
jruby, jruby-head,

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The action works on these [GitHub-hosted runners](https://docs.github.com/en/act
4747
| Operating System | Supported |
4848
| ---------------- | --------- |
4949
| Ubuntu | `ubuntu-20.04`, `ubuntu-22.04`, `ubuntu-24.04` |
50-
| macOS | `macos-12` and newer versions |
50+
| macOS | `macos-13` and newer versions |
5151
| Windows | `windows-2019`, `windows-2022` |
5252

5353
The prebuilt releases are generated by [ruby-builder](https://github.com/ruby/ruby-builder)

dist/index.js

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, parsedVe
173173
// Well known version-platform combinations which do not work:
174174
if (engine === 'ruby' && platform.startsWith('macos') && os.arch() === 'arm64' && common.floatVersion(version) < 2.6) {
175175
throw new Error(`CRuby < 2.6 does not support macos-arm64.
176-
Either use a newer Ruby version or use a macOS image running on amd64, e.g., macos-13 or macos-12.
176+
Either use a newer Ruby version or use a macOS image running on amd64, e.g., macos-13.
177177
Note that GitHub changed the meaning of macos-latest from macos-12 (amd64) to macos-14 (arm64):
178178
https://github.blog/changelog/2024-04-01-macos-14-sonoma-is-generally-available-and-the-latest-macos-runner-image/
179179

ruby-builder.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ export async function install(platform, engine, version) {
5454
await downloadAndExtract(platform, engine, version, rubyPrefix)
5555
}
5656

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-
6357
return rubyPrefix
6458
}
6559

0 commit comments

Comments
 (0)