diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a9d59ce..a6c6356 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, macos-10.15, windows-2016, windows-2019 ] + os: [ ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11.0, windows-2016, windows-2019 ] # Use various version syntax here for testing ruby: [ 2.1, 2.2, 2.3, 2.4, 2.5, 2.6.6, 2.7, ruby-head, debug, jruby-9.1, jruby, jruby-head, truffleruby, truffleruby-head ] include: diff --git a/README.md b/README.md index d7bd1f4..82e8bba 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ The action works for all [GitHub-hosted runners](https://help.github.com/en/acti | Operating System | Recommended | Other Supported Versions | | ----------- | -------- | -------- | | Ubuntu | `ubuntu-latest` (= `ubuntu-18.04`) | `ubuntu-20.04`, `ubuntu-16.04` | -| macOS | `macos-latest` (= `macos-10.15`) | | +| macOS | `macos-latest` (= `macos-10.15`) | `macos-11.0` | | Windows | `windows-latest` (= `windows-2019`) | `windows-2016` | The prebuilt releases are generated by [ruby-builder](https://github.com/ruby/ruby-builder) diff --git a/common.js b/common.js index 03e7101..4587abc 100644 --- a/common.js +++ b/common.js @@ -52,9 +52,9 @@ export function getVirtualEnvironmentName() { return `ubuntu-${match[1]}.04` } - match = imageOS.match(/^macos(\d{2})(\d+)/) // e.g. macos1015 + match = imageOS.match(/^macos(\d{2})(\d+)?/) // e.g. macos1015, macos11 if (match) { - return `macos-${match[1]}.${match[2]}` + return `macos-${match[1]}.${match[2] || '0'}` } match = imageOS.match(/^win(\d+)/) // e.g. win19 diff --git a/dist/index.js b/dist/index.js index 440e66b..23dc791 100644 --- a/dist/index.js +++ b/dist/index.js @@ -32156,9 +32156,9 @@ function getVirtualEnvironmentName() { return `ubuntu-${match[1]}.04` } - match = imageOS.match(/^macos(\d{2})(\d+)/) // e.g. macos1015 + match = imageOS.match(/^macos(\d{2})(\d+)?/) // e.g. macos1015, macos11 if (match) { - return `macos-${match[1]}.${match[2]}` + return `macos-${match[1]}.${match[2] || '0'}` } match = imageOS.match(/^win(\d+)/) // e.g. win19