diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8aca63cdc..baa6c0578 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,11 +41,6 @@ jobs: - { 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' } diff --git a/README.md b/README.md index 2578674e4..76c6a2434 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby: | Interpreter | Versions | | ----------- | -------- | | `ruby` | 1.9.3, 2.0.0, 2.1.9, 2.2, all versions from 2.3.0 until 3.3.0-preview2, head, debug, mingw, mswin, ucrt | -| `jruby` | 9.1.17.0 - 9.4.3.0, head | +| `jruby` | 9.1.17.0 - 9.4.4.0, head | | `truffleruby` | 19.3.0 - 23.1.0, head | | `truffleruby+graalvm` | 21.2.0 - 23.1.0, head | @@ -263,6 +263,9 @@ In other cases, you will need to install Ruby in the runner tool cache as shown (run it so it will show you where to install Ruby). You could of course also not use this action and e.g. use Ruby from a system package or use a Docker image instead. +See also the [`self-hosted:` input](action.yml). +You can set it to `true` if you want to use custom-built Rubies in your self-hosted toolcache instead of prebuild Rubies. + ## History This action used to be at `eregon/use-ruby-action` and was moved to the `ruby` organization. diff --git a/action.yml b/action.yml index 55dbb3e1f..a81bff8b4 100644 --- a/action.yml +++ b/action.yml @@ -34,7 +34,7 @@ inputs: description: | Consider the runner as a self-hosted runner, which means not using prebuilt Ruby binaries which only work on GitHub-hosted runners or self-hosted runners with a very similar image to the ones used by GitHub runners. - The default is to detect this automatically based on the OS, OS version and $RUNNER_TOOL_CACHE. + The default is to detect this automatically based on the OS, OS version and architecture. outputs: ruby-prefix: description: 'The prefix of the installed ruby' diff --git a/common.js b/common.js index 0ba132033..96704ff1b 100644 --- a/common.js +++ b/common.js @@ -173,7 +173,7 @@ const GitHubHostedPlatforms = [ 'windows-2022-x64', ] -// Actually a self-hosted runner for which the OS and OS version does not correspond to a GitHub-hosted runner image, +// Actually a self-hosted runner for which the OS and OS version does not correspond to a GitHub-hosted runner image, export function isSelfHostedRunner() { if (inputs.selfHosted === undefined) { throw new Error('inputs.selfHosted should have been already set') diff --git a/dist/index.js b/dist/index.js index c32f1b40a..a8fafec10 100644 --- a/dist/index.js +++ b/dist/index.js @@ -533,7 +533,7 @@ const GitHubHostedPlatforms = [ 'windows-2022-x64', ] -// Actually a self-hosted runner for which the OS and OS version does not correspond to a GitHub-hosted runner image, +// Actually a self-hosted runner for which the OS and OS version does not correspond to a GitHub-hosted runner image, function isSelfHostedRunner() { if (inputs.selfHosted === undefined) { throw new Error('inputs.selfHosted should have been already set') @@ -65608,7 +65608,7 @@ module.exports = JSON.parse('[[[0,44],"disallowed_STD3_valid"],[[45,46],"valid"] /***/ ((module) => { "use strict"; -module.exports = JSON.parse('{"ruby":["1.9.3-p551","2.0.0-p648","2.1.9","2.2.10","2.3.0","2.3.1","2.3.2","2.3.3","2.3.4","2.3.5","2.3.6","2.3.7","2.3.8","2.4.0","2.4.1","2.4.2","2.4.3","2.4.4","2.4.5","2.4.6","2.4.7","2.4.9","2.4.10","2.5.0","2.5.1","2.5.2","2.5.3","2.5.4","2.5.5","2.5.6","2.5.7","2.5.8","2.5.9","2.6.0","2.6.1","2.6.2","2.6.3","2.6.4","2.6.5","2.6.6","2.6.7","2.6.8","2.6.9","2.6.10","2.7.0","2.7.1","2.7.2","2.7.3","2.7.4","2.7.5","2.7.6","2.7.7","2.7.8","3.0.0-preview1","3.0.0-preview2","3.0.0-rc1","3.0.0","3.0.1","3.0.2","3.0.3","3.0.4","3.0.5","3.0.6","3.1.0-preview1","3.1.0","3.1.1","3.1.2","3.1.3","3.1.4","3.2.0-preview1","3.2.0-preview2","3.2.0-preview3","3.2.0-rc1","3.2.0","3.2.1","3.2.2","3.3.0-preview1","3.3.0-preview2","head","debug"],"jruby":["9.1.17.0","9.2.9.0","9.2.10.0","9.2.11.0","9.2.11.1","9.2.12.0","9.2.13.0","9.2.14.0","9.2.15.0","9.2.16.0","9.2.17.0","9.2.18.0","9.2.19.0","9.2.20.0","9.2.20.1","9.2.21.0","9.3.0.0","9.3.1.0","9.3.2.0","9.3.3.0","9.3.4.0","9.3.6.0","9.3.7.0","9.3.8.0","9.3.9.0","9.3.10.0","9.3.11.0","9.4.0.0","9.4.1.0","9.4.2.0","9.4.3.0","head"],"truffleruby":["19.3.0","19.3.1","20.0.0","20.1.0","20.2.0","20.3.0","21.0.0","21.1.0","21.2.0","21.2.0.1","21.3.0","22.0.0.2","22.1.0","22.2.0","22.3.0","22.3.1","23.0.0-preview1","23.0.0","23.1.0","head"],"truffleruby+graalvm":["21.2.0","21.3.0","22.0.0.2","22.1.0","22.2.0","22.3.0","22.3.1","23.0.0-preview1","23.0.0","23.1.0","head"]}'); +module.exports = JSON.parse('{"ruby":["1.9.3-p551","2.0.0-p648","2.1.9","2.2.10","2.3.0","2.3.1","2.3.2","2.3.3","2.3.4","2.3.5","2.3.6","2.3.7","2.3.8","2.4.0","2.4.1","2.4.2","2.4.3","2.4.4","2.4.5","2.4.6","2.4.7","2.4.9","2.4.10","2.5.0","2.5.1","2.5.2","2.5.3","2.5.4","2.5.5","2.5.6","2.5.7","2.5.8","2.5.9","2.6.0","2.6.1","2.6.2","2.6.3","2.6.4","2.6.5","2.6.6","2.6.7","2.6.8","2.6.9","2.6.10","2.7.0","2.7.1","2.7.2","2.7.3","2.7.4","2.7.5","2.7.6","2.7.7","2.7.8","3.0.0-preview1","3.0.0-preview2","3.0.0-rc1","3.0.0","3.0.1","3.0.2","3.0.3","3.0.4","3.0.5","3.0.6","3.1.0-preview1","3.1.0","3.1.1","3.1.2","3.1.3","3.1.4","3.2.0-preview1","3.2.0-preview2","3.2.0-preview3","3.2.0-rc1","3.2.0","3.2.1","3.2.2","3.3.0-preview1","3.3.0-preview2","head","debug"],"jruby":["9.1.17.0","9.2.9.0","9.2.10.0","9.2.11.0","9.2.11.1","9.2.12.0","9.2.13.0","9.2.14.0","9.2.15.0","9.2.16.0","9.2.17.0","9.2.18.0","9.2.19.0","9.2.20.0","9.2.20.1","9.2.21.0","9.3.0.0","9.3.1.0","9.3.2.0","9.3.3.0","9.3.4.0","9.3.6.0","9.3.7.0","9.3.8.0","9.3.9.0","9.3.10.0","9.3.11.0","9.4.0.0","9.4.1.0","9.4.2.0","9.4.3.0","9.4.4.0","head"],"truffleruby":["19.3.0","19.3.1","20.0.0","20.1.0","20.2.0","20.3.0","21.0.0","21.1.0","21.2.0","21.2.0.1","21.3.0","22.0.0.2","22.1.0","22.2.0","22.3.0","22.3.1","23.0.0-preview1","23.0.0","23.1.0","head"],"truffleruby+graalvm":["21.2.0","21.3.0","22.0.0.2","22.1.0","22.2.0","22.3.0","22.3.1","23.0.0-preview1","23.0.0","23.1.0","head"]}'); /***/ }), @@ -65695,9 +65695,6 @@ __nccwpck_require__.r(__webpack_exports__); /* harmony export */ "run": () => (/* binding */ run), /* harmony export */ "setupRuby": () => (/* binding */ setupRuby) /* harmony export */ }); -/* harmony import */ var _common__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(3143); - - const os = __nccwpck_require__(2037) const fs = __nccwpck_require__(7147) const path = __nccwpck_require__(1017) diff --git a/index.js b/index.js index f34b281dc..e636b2ea6 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,3 @@ -import {getOSNameVersion} from "./common"; - const os = require('os') const fs = require('fs') const path = require('path') diff --git a/ruby-builder-versions.json b/ruby-builder-versions.json index 978c82390..2a7ff2fdf 100644 --- a/ruby-builder-versions.json +++ b/ruby-builder-versions.json @@ -19,7 +19,7 @@ "9.1.17.0", "9.2.9.0", "9.2.10.0", "9.2.11.0", "9.2.11.1", "9.2.12.0", "9.2.13.0", "9.2.14.0", "9.2.15.0", "9.2.16.0", "9.2.17.0", "9.2.18.0", "9.2.19.0", "9.2.20.0", "9.2.20.1", "9.2.21.0", "9.3.0.0", "9.3.1.0", "9.3.2.0", "9.3.3.0", "9.3.4.0", "9.3.6.0", "9.3.7.0", "9.3.8.0", "9.3.9.0", "9.3.10.0", "9.3.11.0", - "9.4.0.0", "9.4.1.0", "9.4.2.0", "9.4.3.0", + "9.4.0.0", "9.4.1.0", "9.4.2.0", "9.4.3.0", "9.4.4.0", "head" ], "truffleruby": [