mirror of
https://github.com/ruby/setup-ruby.git
synced 2026-09-13 14:34:21 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ae195bbe74 | ||
|
|
d354de180d | ||
|
|
ed55d55e82 | ||
|
|
a25f1e45f0 | ||
|
|
211ffaaa5f | ||
|
|
f8d7259c7a | ||
|
|
ac793fdd38 | ||
|
|
5f8a775744 | ||
|
|
30a6546035 | ||
|
|
d697be2f83 | ||
|
|
8aeb6ff803 | ||
|
|
09e84e3b9d | ||
|
|
d5126b9b35 | ||
|
|
274049f8cf | ||
|
|
a96ff531da |
@@ -11,7 +11,7 @@ jobs:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
GH_REPO: ${{ github.repository }}
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- uses: ./
|
||||
|
||||
+26
-22
@@ -17,9 +17,9 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, ubuntu-24.04-arm, macos-13, macos-14, macos-15, macos-15-intel, windows-2022, windows-2025, windows-11-arm ]
|
||||
os: [ ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, ubuntu-24.04-arm, macos-14, macos-15, macos-15-intel, windows-2022, windows-2025, windows-11-arm ]
|
||||
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', '3.4', ruby-head,
|
||||
'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', '4.0', ruby-head,
|
||||
jruby-9.4, jruby, jruby-head,
|
||||
truffleruby, truffleruby-head,
|
||||
truffleruby+graalvm, truffleruby+graalvm-head
|
||||
@@ -79,6 +79,10 @@ jobs:
|
||||
- { os: windows-2022, ruby: '1.9' }
|
||||
- { os: windows-2025, ruby: '1.9' }
|
||||
- { os: windows-11-arm, ruby: '1.9' }
|
||||
# No preview builds on Windows
|
||||
- { os: windows-2022, ruby: '4.0' }
|
||||
- { os: windows-2025, ruby: '4.0' }
|
||||
- { os: windows-11-arm, ruby: '4.0' }
|
||||
# TruffleRuby does not support Windows
|
||||
- { os: windows-2022, ruby: truffleruby }
|
||||
- { os: windows-2025, ruby: truffleruby }
|
||||
@@ -96,7 +100,7 @@ jobs:
|
||||
name: ${{ matrix.os }} ${{ matrix.ruby }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- uses: ./
|
||||
with:
|
||||
@@ -202,7 +206,7 @@ jobs:
|
||||
name: "Test .ruby-version"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- run: echo "ruby-3.4.0" > .ruby-version
|
||||
- uses: ./
|
||||
- run: ruby -v | grep -F "ruby 3.4.0"
|
||||
@@ -211,7 +215,7 @@ jobs:
|
||||
name: "Test .tool-versions"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- run: echo -e "nodejs 16.0.0\nruby 3.4.0" > .tool-versions
|
||||
- uses: ./
|
||||
- run: ruby -v | grep -F "ruby 3.4.0"
|
||||
@@ -220,7 +224,7 @@ jobs:
|
||||
name: "Test mise.toml"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- run: echo -e "[tools]\nnode = '18'\nruby = '3.4.0'" > mise.toml
|
||||
- uses: ./
|
||||
- run: ruby -v | grep -F "ruby 3.4.0"
|
||||
@@ -229,7 +233,7 @@ jobs:
|
||||
name: "Test with no Gemfile"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- run: rm Gemfile
|
||||
- uses: ./
|
||||
with:
|
||||
@@ -240,7 +244,7 @@ jobs:
|
||||
name: "Test with no Gemfile but with bundler-cache"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- run: rm Gemfile
|
||||
- uses: ./
|
||||
with:
|
||||
@@ -263,7 +267,7 @@ jobs:
|
||||
- { ruby: '2.3', expected_rubygems_version: '3.3.27' }
|
||||
- { ruby: '2.0', expected_rubygems_version: '2.7.11' }
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./
|
||||
with:
|
||||
ruby-version: ${{ matrix.ruby }}
|
||||
@@ -274,7 +278,7 @@ jobs:
|
||||
name: "Test rubygems: version upgrades RubyGems to that version if the default is older"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./
|
||||
with:
|
||||
ruby-version: '2.6'
|
||||
@@ -285,7 +289,7 @@ jobs:
|
||||
name: "Test rubygems: version noops if the default is newer"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./
|
||||
with:
|
||||
ruby-version: '3.1.0'
|
||||
@@ -296,7 +300,7 @@ jobs:
|
||||
name: "Test rubygems: version uses the Bundler installed by the rubygems update"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./
|
||||
with:
|
||||
ruby-version: '3.1.0'
|
||||
@@ -308,7 +312,7 @@ jobs:
|
||||
name: "Test bundler: 1.x for old Ruby"
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./
|
||||
with:
|
||||
ruby-version: '2.3'
|
||||
@@ -319,7 +323,7 @@ jobs:
|
||||
name: "Test with a major Bundler version"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./
|
||||
with:
|
||||
ruby-version: '2.6'
|
||||
@@ -330,7 +334,7 @@ jobs:
|
||||
name: "Test with a minor Bundler version"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./
|
||||
with:
|
||||
ruby-version: '2.6'
|
||||
@@ -341,7 +345,7 @@ jobs:
|
||||
name: "Test with an exact Bundler version"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./
|
||||
with:
|
||||
ruby-version: '2.6'
|
||||
@@ -352,7 +356,7 @@ jobs:
|
||||
name: "Test with a Bundler pre/rc version"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./
|
||||
with:
|
||||
ruby-version: '2.6'
|
||||
@@ -365,7 +369,7 @@ jobs:
|
||||
env:
|
||||
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/bundler-dev.gemfile
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./
|
||||
with:
|
||||
ruby-version: ruby-head
|
||||
@@ -377,7 +381,7 @@ jobs:
|
||||
env:
|
||||
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/bundler1.gemfile
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./
|
||||
with:
|
||||
ruby-version: '2.7'
|
||||
@@ -395,7 +399,7 @@ jobs:
|
||||
env:
|
||||
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./
|
||||
with:
|
||||
ruby-version: '3.2'
|
||||
@@ -406,7 +410,7 @@ jobs:
|
||||
name: "Test windows-toolchain: none"
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./
|
||||
with:
|
||||
ruby-version: '2.7'
|
||||
@@ -418,7 +422,7 @@ jobs:
|
||||
lint:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
- run: yarn install
|
||||
- run: yarn run package
|
||||
- name: Check generated files are up to date
|
||||
|
||||
@@ -9,7 +9,7 @@ jobs:
|
||||
update_branch:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- run: git push origin HEAD:v1
|
||||
|
||||
@@ -15,7 +15,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.5.0-preview1, head, debug, mingw, mswin, ucrt |
|
||||
| `ruby` | 1.9.3, 2.0.0, 2.1.9, 2.2, all versions from 2.3.0 until 4.0.0, head, debug, mingw, mswin, ucrt |
|
||||
| `jruby` | 9.1.17.0 - 10.0.2.0, head |
|
||||
| `truffleruby` | 19.3.0 - 25.0.0, head |
|
||||
| `truffleruby+graalvm` | 21.2.0 - 25.0.0, head |
|
||||
@@ -50,7 +50,7 @@ The action works on these [GitHub-hosted runners](https://docs.github.com/en/act
|
||||
| Operating System | Supported |
|
||||
| ---------------- | --------- |
|
||||
| Ubuntu | `ubuntu-22.04`, `ubuntu-24.04`, `ubuntu-22.04-arm`, `ubuntu-24.04-arm` |
|
||||
| macOS | `macos-13` and newer versions |
|
||||
| macOS | `macos-14` and newer versions |
|
||||
| Windows | `windows-2022`, `windows-2025`, `windows-11-arm` |
|
||||
|
||||
Not all combinations of runner images and versions are supported.
|
||||
|
||||
+41
-19
@@ -1,4 +1,5 @@
|
||||
const fs = require('fs')
|
||||
const os = require('os')
|
||||
const path = require('path')
|
||||
const core = require('@actions/core')
|
||||
const exec = require('@actions/exec')
|
||||
@@ -66,17 +67,15 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
|
||||
}
|
||||
}
|
||||
|
||||
const floatVersion = common.floatVersion(rubyVersion)
|
||||
|
||||
if (bundlerVersion === 'default') {
|
||||
if (common.isBundler2dot2Default(engine, rubyVersion)) {
|
||||
if (common.isBundler2dot2PlusDefault(engine, rubyVersion)) {
|
||||
if (common.windows && engine === 'ruby' && (common.isStableVersion(engine, rubyVersion) || rubyVersion === 'head')) {
|
||||
// https://github.com/ruby/setup-ruby/issues/371
|
||||
console.log(`Installing latest Bundler for ${engine}-${rubyVersion} on Windows because bin/bundle does not work in bash otherwise`)
|
||||
bundlerVersion = 'latest'
|
||||
} else {
|
||||
console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`)
|
||||
return '2'
|
||||
console.log(`Using Bundler shipped with ${engine}-${rubyVersion}`)
|
||||
return common.isBundler4PlusDefault(engine, rubyVersion) ? '4' : '2'
|
||||
}
|
||||
} else if (common.hasBundlerDefaultGem(engine, rubyVersion)) {
|
||||
// Those Rubies have a old Bundler default gem < 2.2 which does not work well for `gem 'foo', github: 'foo/foo'`:
|
||||
@@ -89,8 +88,15 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
|
||||
}
|
||||
}
|
||||
|
||||
const targetRubyVersion = common.targetRubyVersion(engine, rubyVersion)
|
||||
|
||||
if (bundlerVersion === 'latest') {
|
||||
bundlerVersion = '2'
|
||||
// Bundler 4 requires Ruby 3.2+
|
||||
if (targetRubyVersion < 3.2) {
|
||||
bundlerVersion = '2'
|
||||
} else {
|
||||
bundlerVersion = '4'
|
||||
}
|
||||
}
|
||||
|
||||
if (isValidBundlerVersion(bundlerVersion)) {
|
||||
@@ -99,24 +105,29 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
|
||||
throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
|
||||
}
|
||||
|
||||
// Use Bundler 1 when we know Bundler 2 does not work
|
||||
if (bundlerVersion.startsWith('2')) {
|
||||
if (engine === 'ruby' && floatVersion <= 2.2) {
|
||||
console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby <= 2.2')
|
||||
// Only use Bundler 4 on Ruby 3.2+
|
||||
if (common.floatVersion(bundlerVersion) >= 4 && targetRubyVersion < 3.2) {
|
||||
console.log('Bundler 4 requires Ruby 3.2+, using Bundler 2 instead on Ruby < 3.2')
|
||||
bundlerVersion = '2'
|
||||
}
|
||||
|
||||
// Use Bundler 1 when we know Bundler 2+ does not work
|
||||
if (common.floatVersion(bundlerVersion) >= 2) {
|
||||
if (engine === 'ruby' && targetRubyVersion <= 2.2) {
|
||||
console.log(`Bundler 2+ requires Ruby 2.3+, using Bundler 1 on Ruby <= 2.2`)
|
||||
bundlerVersion = '1'
|
||||
} else if (engine === 'ruby' && /^2\.3\.[01]/.test(rubyVersion)) {
|
||||
console.log('Ruby 2.3.0 and 2.3.1 have shipped with an old rubygems that only works with Bundler 1')
|
||||
bundlerVersion = '1'
|
||||
} else if (engine === 'jruby' && rubyVersion.startsWith('9.1')) { // JRuby 9.1 targets Ruby 2.3, treat it the same
|
||||
console.log('JRuby 9.1 has a bug with Bundler 2 (https://github.com/ruby/setup-ruby/issues/108), using Bundler 1 instead on JRuby 9.1')
|
||||
console.log('JRuby 9.1 has a bug with Bundler 2+ (https://github.com/ruby/setup-ruby/issues/108), using Bundler 1 instead on JRuby 9.1')
|
||||
bundlerVersion = '1'
|
||||
}
|
||||
}
|
||||
|
||||
const targetRubyVersion = common.targetRubyVersion(engine, rubyVersion)
|
||||
// Use Bundler 2.3 when we use Ruby 2.3.2 - 2.5
|
||||
// Use Bundler 2.4 when we use Ruby 2.6-2.7
|
||||
if (bundlerVersion == '2') {
|
||||
if (bundlerVersion === '2') {
|
||||
if (targetRubyVersion <= 2.5) { // < 2.3.2 already handled above
|
||||
console.log('Ruby 2.3.2 - 2.5 only works with Bundler 2.3')
|
||||
bundlerVersion = '2.3'
|
||||
@@ -136,6 +147,14 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
|
||||
return bundlerVersion
|
||||
}
|
||||
|
||||
function bundlerConfigSetArgs(bundlerVersion, key, value) {
|
||||
if (bundlerVersion.startsWith('1')) {
|
||||
return ['config', '--local', key, value]
|
||||
} else {
|
||||
return ['config', 'set', '--local', key, value]
|
||||
}
|
||||
}
|
||||
|
||||
export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, bundlerVersion, cacheVersion) {
|
||||
if (gemfile === null) {
|
||||
console.log('Could not determine gemfile path, skipping "bundle install" and caching')
|
||||
@@ -143,8 +162,8 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
|
||||
}
|
||||
|
||||
let envOptions = {}
|
||||
if (bundlerVersion.startsWith('1') && common.isBundler2Default(engine, rubyVersion)) {
|
||||
// If Bundler 1 is specified on Rubies which ship with Bundler 2,
|
||||
if (bundlerVersion.startsWith('1') && common.isBundler2PlusDefault(engine, rubyVersion)) {
|
||||
// If Bundler 1 is specified on Rubies which ship with Bundler 2+,
|
||||
// we need to specify which Bundler version to use explicitly until the lockfile exists.
|
||||
console.log(`Setting BUNDLER_VERSION=${bundlerVersion} for "bundle config|lock" commands below to ensure Bundler 1 is used`)
|
||||
envOptions = { env: { ...process.env, BUNDLER_VERSION: bundlerVersion } }
|
||||
@@ -155,10 +174,10 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
|
||||
// An absolute path, so it is reliably under $PWD/vendor/bundle, and not relative to the gemfile's directory
|
||||
const bundleCachePath = path.join(process.cwd(), cachePath)
|
||||
|
||||
await exec.exec('bundle', ['config', '--local', 'path', bundleCachePath], envOptions)
|
||||
await exec.exec('bundle', bundlerConfigSetArgs(bundlerVersion, 'path', bundleCachePath), envOptions)
|
||||
|
||||
if (fs.existsSync(lockFile)) {
|
||||
await exec.exec('bundle', ['config', '--local', 'deployment', 'true'], envOptions)
|
||||
await exec.exec('bundle', bundlerConfigSetArgs(bundlerVersion, 'deployment', 'true'), envOptions)
|
||||
} else {
|
||||
// Generate the lockfile so we can use it to compute the cache key.
|
||||
// This will also automatically pick up the latest gem versions compatible with the Gemfile.
|
||||
@@ -193,11 +212,14 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
|
||||
console.log(`Found cache for key: ${cachedKey}`)
|
||||
}
|
||||
|
||||
// Number of jobs should scale with runner, up to a point
|
||||
const jobs = Math.min(os.availableParallelism(), 8)
|
||||
// Always run 'bundle install' to list the gems
|
||||
await exec.exec('bundle', ['install', '--jobs', '4'])
|
||||
await exec.exec('bundle', ['install', '--jobs', `${jobs}`])
|
||||
|
||||
// @actions/cache only allows to save for non-existing keys
|
||||
if (!common.isExactCacheKeyMatch(key, cachedKey)) {
|
||||
// Also, skip saving cache for merge_group event
|
||||
if (!common.isExactCacheKeyMatch(key, cachedKey) && process.env['GITHUB_EVENT_NAME'] !== 'merge_group') {
|
||||
if (cachedKey) { // existing cache but Gemfile.lock differs, clean old gems
|
||||
await exec.exec('bundle', ['clean'])
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ const linuxOSInfo = require('linux-os-info')
|
||||
export const windows = (os.platform() === 'win32')
|
||||
// Extract to SSD on Windows, see https://github.com/ruby/setup-ruby/pull/14
|
||||
export const drive = (windows ? (process.env['RUNNER_TEMP'] || 'C')[0] : undefined)
|
||||
const PATH_ENV_VAR = windows ? 'Path' : 'PATH'
|
||||
|
||||
export const inputs = {
|
||||
selfHosted: undefined
|
||||
@@ -80,7 +81,7 @@ export function isStableVersion(engine, rubyVersion) {
|
||||
}
|
||||
|
||||
export function hasBundlerDefaultGem(engine, rubyVersion) {
|
||||
return isBundler1Default(engine, rubyVersion) || isBundler2Default(engine, rubyVersion)
|
||||
return isBundler1Default(engine, rubyVersion) || isBundler2PlusDefault(engine, rubyVersion)
|
||||
}
|
||||
|
||||
export function isBundler1Default(engine, rubyVersion) {
|
||||
@@ -95,7 +96,7 @@ export function isBundler1Default(engine, rubyVersion) {
|
||||
}
|
||||
}
|
||||
|
||||
export function isBundler2Default(engine, rubyVersion) {
|
||||
export function isBundler2PlusDefault(engine, rubyVersion) {
|
||||
if (engine === 'ruby') {
|
||||
return floatVersion(rubyVersion) >= 2.7
|
||||
} else if (engine.startsWith('truffleruby')) {
|
||||
@@ -107,7 +108,7 @@ export function isBundler2Default(engine, rubyVersion) {
|
||||
}
|
||||
}
|
||||
|
||||
export function isBundler2dot2Default(engine, rubyVersion) {
|
||||
export function isBundler2dot2PlusDefault(engine, rubyVersion) {
|
||||
if (engine === 'ruby') {
|
||||
return floatVersion(rubyVersion) >= 3.0
|
||||
} else if (engine.startsWith('truffleruby')) {
|
||||
@@ -119,6 +120,13 @@ export function isBundler2dot2Default(engine, rubyVersion) {
|
||||
}
|
||||
}
|
||||
|
||||
const UNKNOWN_TARGET_RUBY_VERSION = 9.9
|
||||
|
||||
export function isBundler4PlusDefault(engine, rubyVersion) {
|
||||
const version = targetRubyVersion(engine, rubyVersion)
|
||||
return version != UNKNOWN_TARGET_RUBY_VERSION && version >= 4.0
|
||||
}
|
||||
|
||||
export function targetRubyVersion(engine, rubyVersion) {
|
||||
const version = floatVersion(rubyVersion)
|
||||
if (engine === 'ruby') {
|
||||
@@ -132,6 +140,8 @@ export function targetRubyVersion(engine, rubyVersion) {
|
||||
return 2.6
|
||||
} else if (version === 9.4) {
|
||||
return 3.1
|
||||
} else if (version === 10.0) {
|
||||
return 3.4
|
||||
}
|
||||
} else if (engine.startsWith('truffleruby')) {
|
||||
if (version < 21.0) {
|
||||
@@ -147,11 +157,11 @@ export function targetRubyVersion(engine, rubyVersion) {
|
||||
}
|
||||
}
|
||||
|
||||
return 9.9 // unknown, assume recent
|
||||
return UNKNOWN_TARGET_RUBY_VERSION // unknown, assume recent
|
||||
}
|
||||
|
||||
export function floatVersion(rubyVersion) {
|
||||
const match = rubyVersion.match(/^\d+\.\d+/)
|
||||
const match = rubyVersion.match(/^\d+(\.\d+|$)/)
|
||||
if (match) {
|
||||
return parseFloat(match[0])
|
||||
} else if (isHeadVersion(rubyVersion)) {
|
||||
@@ -356,23 +366,22 @@ export function win2nix(path) {
|
||||
}
|
||||
|
||||
export function setupPath(newPathEntries) {
|
||||
const envPath = windows ? 'Path' : 'PATH'
|
||||
const originalPath = process.env[envPath].split(path.delimiter)
|
||||
const originalPath = process.env[PATH_ENV_VAR].split(path.delimiter)
|
||||
let cleanPath = originalPath.filter(entry => !/\bruby\b/i.test(entry))
|
||||
|
||||
core.group(`Modifying ${envPath}`, async () => {
|
||||
core.group(`Modifying ${PATH_ENV_VAR}`, async () => {
|
||||
// First remove the conflicting path entries
|
||||
if (cleanPath.length !== originalPath.length) {
|
||||
console.log(`Entries removed from ${envPath} to avoid conflicts with default Ruby:`)
|
||||
console.log(`Entries removed from ${PATH_ENV_VAR} to avoid conflicts with default Ruby:`)
|
||||
for (const entry of originalPath) {
|
||||
if (!cleanPath.includes(entry)) {
|
||||
console.log(` ${entry}`)
|
||||
}
|
||||
}
|
||||
core.exportVariable(envPath, cleanPath.join(path.delimiter))
|
||||
core.exportVariable(PATH_ENV_VAR, cleanPath.join(path.delimiter))
|
||||
}
|
||||
|
||||
console.log(`Entries added to ${envPath} to use selected Ruby:`)
|
||||
console.log(`Entries added to ${PATH_ENV_VAR} to use selected Ruby:`)
|
||||
for (const entry of newPathEntries) {
|
||||
console.log(` ${entry}`)
|
||||
}
|
||||
@@ -406,14 +415,17 @@ export async function setupJavaHome(rubyPrefix) {
|
||||
// JAVA_HOME_21_X64 - https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md#java
|
||||
let newHomeVar = `JAVA_HOME_21_${arch}`
|
||||
let newHome = process.env[newHomeVar]
|
||||
let bin = path.join(newHome, 'bin')
|
||||
|
||||
if (newHome === "undefined") {
|
||||
throw new Error(`JAVA_HOME is not Java 21+ needed for JRuby and \$${newHomeVar} is not defined`)
|
||||
}
|
||||
|
||||
console.log(`Setting JAVA_HOME to ${newHomeVar} path ${newHome}`)
|
||||
|
||||
core.exportVariable("JAVA_HOME", newHome)
|
||||
|
||||
console.log(`Adding ${bin} to ${PATH_ENV_VAR}`)
|
||||
core.addPath(bin)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
+74
-39
File diff suppressed because one or more lines are too long
@@ -175,7 +175,7 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, parsedVe
|
||||
// Well known version-platform combinations which do not work:
|
||||
if (engine === 'ruby' && platform.startsWith('macos') && os.arch() === 'arm64' && common.floatVersion(version) < 2.6) {
|
||||
throw new Error(`CRuby < 2.6 does not support macos-arm64.
|
||||
Either use a newer Ruby version or use a macOS image running on amd64, e.g., macos-13.
|
||||
Either use a newer Ruby version or use a macOS image running on amd64, e.g., macos-15-intel.
|
||||
Note that GitHub changed the meaning of macos-latest from macos-12 (amd64) to macos-14 (arm64):
|
||||
https://github.blog/changelog/2024-04-01-macos-14-sonoma-is-generally-available-and-the-latest-macos-runner-image/
|
||||
|
||||
@@ -188,8 +188,8 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, parsedVe
|
||||
- { os: macos-latest, ruby: '2.4' }
|
||||
- { os: macos-latest, ruby: '2.5' }
|
||||
include:
|
||||
- { os: macos-13, ruby: '2.4' }
|
||||
- { os: macos-13, ruby: '2.5' }
|
||||
- { os: macos-15-intel, ruby: '2.4' }
|
||||
- { os: macos-15-intel, ruby: '2.5' }
|
||||
|
||||
But of course you should consider dropping support for these long-EOL Rubies, which cannot even be built on recent macOS machines.`)
|
||||
} else if (engine === 'truffleruby' && platform.startsWith('windows')) {
|
||||
|
||||
@@ -13,8 +13,9 @@
|
||||
"3.1.0-preview1", "3.1.0", "3.1.1", "3.1.2", "3.1.3", "3.1.4", "3.1.5", "3.1.6", "3.1.7",
|
||||
"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.2.3", "3.2.4", "3.2.5", "3.2.6", "3.2.7", "3.2.8", "3.2.9",
|
||||
"3.3.0-preview1", "3.3.0-preview2", "3.3.0-preview3", "3.3.0-rc1", "3.3.0", "3.3.1", "3.3.2", "3.3.3", "3.3.4", "3.3.5", "3.3.6", "3.3.7", "3.3.8", "3.3.9", "3.3.10",
|
||||
"3.4.0-preview1", "3.4.0-preview2", "3.4.0-rc1", "3.4.0", "3.4.1", "3.4.2", "3.4.3", "3.4.4", "3.4.5", "3.4.6", "3.4.7",
|
||||
"3.4.0-preview1", "3.4.0-preview2", "3.4.0-rc1", "3.4.0", "3.4.1", "3.4.2", "3.4.3", "3.4.4", "3.4.5", "3.4.6", "3.4.7", "3.4.8",
|
||||
"3.5.0-preview1",
|
||||
"4.0.0-preview2", "4.0.0-preview3", "4.0.0",
|
||||
"head", "debug", "asan", "3.4-asan"
|
||||
],
|
||||
"jruby": [
|
||||
|
||||
@@ -267,6 +267,10 @@
|
||||
"arm64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-clangarm64.7z",
|
||||
"x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"
|
||||
},
|
||||
"3.4.8": {
|
||||
"arm64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-clangarm64.7z",
|
||||
"x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"
|
||||
},
|
||||
"head": {
|
||||
"arm64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-clangarm64.7z",
|
||||
"x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"
|
||||
|
||||
@@ -267,6 +267,10 @@
|
||||
"arm64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.7-1/rubyinstaller-3.4.7-1-arm.7z",
|
||||
"x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.7-1/rubyinstaller-3.4.7-1-x64.7z"
|
||||
},
|
||||
"3.4.8": {
|
||||
"arm64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.8-1/rubyinstaller-3.4.8-1-arm.7z",
|
||||
"x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.8-1/rubyinstaller-3.4.8-1-x64.7z"
|
||||
},
|
||||
"head": {
|
||||
"arm64": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-arm.7z",
|
||||
"x64": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z"
|
||||
|
||||
Reference in New Issue
Block a user