ruby/setup-ruby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for macos-12

Browse Source
This commit is contained in:
Benoit Daloze
2022-05-16 12:08:36 +02:00
parent b9675e15ad
commit a7439cf424
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/test.yml
+1 -1
View File
@@ -15,7 +15,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11.0, windows-2019, windows-2022 ] os: [ ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11, macos-12, 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', ruby-head, jruby, jruby-head, truffleruby, truffleruby-head, truffleruby+graalvm, truffleruby+graalvm-head ] ruby: [ '1.9', '2.0', '2.1', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', ruby-head, jruby, jruby-head, truffleruby, truffleruby-head, truffleruby+graalvm, truffleruby+graalvm-head ]
include: include:
- { os: ubuntu-22.04, ruby: '3.1.0' } - { os: ubuntu-22.04, ruby: '3.1.0' }
README.md
+2 -2
View File
@@ -39,8 +39,8 @@ The action works on these [GitHub-hosted runners](https://help.github.com/en/act
| Operating System | Recommended | Other Supported Versions | | Operating System | Recommended | Other Supported Versions |
| ----------- | -------- | -------- | | ----------- | -------- | -------- |
| Ubuntu | `ubuntu-latest` (= `ubuntu-20.04`) | `ubuntu-18.04` | | Ubuntu | `ubuntu-latest` (= `ubuntu-20.04`) | `ubuntu-18.04`, `ubuntu-22.04` (beta, only `ruby: 3.1 - head`) |
| macOS | `macos-latest` (= `macos-10.15`) | `macos-11.0` | | macOS | `macos-latest` (= `macos-11`) | `macos-10.15`, `macos-12` (beta) |
| Windows | `windows-latest` (= `windows-2022`) | `windows-2019` | | Windows | `windows-latest` (= `windows-2022`) | `windows-2019` |
On `ubuntu-22.04` (beta), only `ruby: 3.1 - head` are supported, due to Ubuntu 22.04 only supporting OpenSSL 3. On `ubuntu-22.04` (beta), only `ruby: 3.1 - head` are supported, due to Ubuntu 22.04 only supporting OpenSSL 3.
common.js
+7 -2
View File
@@ -103,7 +103,8 @@ export const supportedPlatforms = [
'ubuntu-20.04', 'ubuntu-20.04',
'ubuntu-22.04', 'ubuntu-22.04',
'macos-10.15', 'macos-10.15',
'macos-11.0', 'macos-11',
'macos-12',
'windows-2019', 'windows-2019',
'windows-2022', 'windows-2022',
] ]
@@ -118,7 +119,11 @@ export function getVirtualEnvironmentName() {
match = imageOS.match(/^macos(\d{2})(\d+)?/) // e.g. macos1015, macos11 match = imageOS.match(/^macos(\d{2})(\d+)?/) // e.g. macos1015, macos11
if (match) { if (match) {
return `macos-${match[1]}.${match[2] || '0'}` if (match[2]) {
return `macos-${match[1]}.${match[2]}`
} else {
return `macos-${match[1]}`
}
} }
match = imageOS.match(/^win(\d+)/) // e.g. win19 match = imageOS.match(/^win(\d+)/) // e.g. win19
dist/index.js
Generated Vendored
+7 -2
View File
@@ -372,7 +372,8 @@ const supportedPlatforms = [
'ubuntu-20.04', 'ubuntu-20.04',
'ubuntu-22.04', 'ubuntu-22.04',
'macos-10.15', 'macos-10.15',
'macos-11.0', 'macos-11',
'macos-12',
'windows-2019', 'windows-2019',
'windows-2022', 'windows-2022',
] ]
@@ -387,7 +388,11 @@ function getVirtualEnvironmentName() {
match = imageOS.match(/^macos(\d{2})(\d+)?/) // e.g. macos1015, macos11 match = imageOS.match(/^macos(\d{2})(\d+)?/) // e.g. macos1015, macos11
if (match) { if (match) {
return `macos-${match[1]}.${match[2] || '0'}` if (match[2]) {
return `macos-${match[1]}.${match[2]}`
} else {
return `macos-${match[1]}`
}
} }
match = imageOS.match(/^win(\d+)/) // e.g. win19 match = imageOS.match(/^win(\d+)/) // e.g. win19