actions/setup-ruby
1
0
Fork 0
mirror of https://github.com/ruby/setup-ruby.git synced 2026-09-13 06:34:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for macos-13-arm64 GitHub runners

Browse Source
This commit is contained in:
Benoit Daloze
2023-10-11 18:58:56 +02:00
parent f887fb3d0e
commit 5cfe23c062
5 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/test.yml
+17 -2
View File
@@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, macos-13, windows-2019, windows-2022 ]
os: [ ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, macos-13, macos-arm-oss, 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', ruby-head,
jruby, jruby-head,
@@ -31,7 +31,22 @@ jobs:
- { os: windows-2022, ruby: mswin }
- { os: windows-2022, ruby: ucrt }
exclude:
- { os: ubuntu-22.04, ruby: '2.2' } # https://github.com/ruby/setup-ruby/issues/496
# https://github.com/ruby/setup-ruby/issues/496
- { os: ubuntu-22.04, ruby: '2.2' }
# Too old, fails to compile on macos-arm-oss
- { os: macos-arm-oss, ruby: '1.9' }
- { os: macos-arm-oss, ruby: '2.0' }
- { os: macos-arm-oss, ruby: '2.1' }
- { os: macos-arm-oss, ruby: '2.2' }
- { os: macos-arm-oss, ruby: '2.3' }
- { os: macos-arm-oss, ruby: '2.4' }
- { os: macos-arm-oss, ruby: '2.5' }
# Fails to compile on macos-arm-oss, https://github.com/ruby/setup-ruby/pull/494#issuecomment-1758099885
- { os: macos-arm-oss, ruby: '3.1' }
# No Java available yet on macos-arm-oss images
- { os: macos-arm-oss, ruby: 'jruby' }
- { os: macos-arm-oss, ruby: 'jruby-head' }
# Windows
- { os: windows-2019, ruby: '1.9' }
- { os: windows-2019, ruby: '3.3' }
- { os: windows-2019, ruby: debug }
README.md
+1 -1
View File
@@ -43,7 +43,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` |
| macOS | `macos-11`, `macos-12`, `macos-13` |
| macOS | `macos-11`, `macos-12`, `macos-13`, `macos-13-xlarge` (arm64) |
| Windows | `windows-2019`, `windows-2022` |
The prebuilt releases are generated by [ruby-builder](https://github.com/ruby/ruby-builder)
common.js
+2 -1
View File
@@ -168,6 +168,7 @@ const GitHubHostedPlatforms = [
'macos-11-x64',
'macos-12-x64',
'macos-13-x64',
'macos-13-arm64',
'windows-2019-x64',
'windows-2022-x64',
]
@@ -243,7 +244,7 @@ export function getToolCachePath() {
return getRunnerToolCache()
} else {
// Rubies prebuilt by this action embed this path rather than using $RUNNER_TOOL_CACHE
// so use that path is not isSelfHostedRunner()
// so use that path if not isSelfHostedRunner()
return getDefaultToolCachePath()
}
}
dist/index.js
Generated Vendored
+8 -3
View File
@@ -528,6 +528,7 @@ const GitHubHostedPlatforms = [
'macos-11-x64',
'macos-12-x64',
'macos-13-x64',
'macos-13-arm64',
'windows-2019-x64',
'windows-2022-x64',
]
@@ -603,7 +604,7 @@ function getToolCachePath() {
return getRunnerToolCache()
} else {
// Rubies prebuilt by this action embed this path rather than using $RUNNER_TOOL_CACHE
// so use that path is not isSelfHostedRunner()
// so use that path if not isSelfHostedRunner()
return getDefaultToolCachePath()
}
}
@@ -65053,10 +65054,14 @@ async function downloadAndExtract(platform, engine, version, rubyPrefix) {
function getDownloadURL(platform, engine, version) {
let builderPlatform = platform
if (platform.startsWith('windows-')) {
if (platform.startsWith('windows-') && os.arch() === 'x64') {
builderPlatform = 'windows-latest'
} else if (platform.startsWith('macos-')) {
builderPlatform = 'macos-latest'
if (os.arch() === 'x64') {
builderPlatform = 'macos-latest'
} else if (os.arch() === 'arm64') {
builderPlatform = 'macos-13-arm64'
}
}
if (common.isHeadVersion(version)) {
ruby-builder.js
+6 -2
View File
@@ -101,10 +101,14 @@ async function downloadAndExtract(platform, engine, version, rubyPrefix) {
function getDownloadURL(platform, engine, version) {
let builderPlatform = platform
if (platform.startsWith('windows-')) {
if (platform.startsWith('windows-') && os.arch() === 'x64') {
builderPlatform = 'windows-latest'
} else if (platform.startsWith('macos-')) {
builderPlatform = 'macos-latest'
if (os.arch() === 'x64') {
builderPlatform = 'macos-latest'
} else if (os.arch() === 'arm64') {
builderPlatform = 'macos-13-arm64'
}
}
if (common.isHeadVersion(version)) {