mirror of
https://github.com/ruby/setup-ruby.git
synced 2026-09-13 14:34:21 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
961f85197f | ||
|
|
28f930222f |
@@ -169,15 +169,25 @@ jobs:
|
|||||||
- run: ruby -v
|
- run: ruby -v
|
||||||
|
|
||||||
testLatestRubygemsVersion:
|
testLatestRubygemsVersion:
|
||||||
name: "Test rubygems: latest upgrades the default RubyGems version"
|
name: "Test rubygems: latest on Ruby ${{ matrix.ruby }}"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- { ruby: '3.2', expected_rubygems_version: '3.5.3' }
|
||||||
|
- { ruby: '3.0', expected_rubygems_version: '3.5.3' }
|
||||||
|
- { ruby: '2.7', expected_rubygems_version: '3.4.22' }
|
||||||
|
- { ruby: '2.6', expected_rubygems_version: '3.4.22' }
|
||||||
|
- { ruby: '2.5', expected_rubygems_version: '3.3.27' }
|
||||||
|
- { ruby: '2.3', expected_rubygems_version: '3.3.27' }
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: '2.6'
|
ruby-version: ${{ matrix.ruby }}
|
||||||
rubygems: latest
|
rubygems: latest
|
||||||
- run: ruby -e "exit(Gem.rubygems_version > Gem::Version.new('3.0.3'))"
|
- run: ruby -e 'puts Gem::VERSION; exit(Gem.rubygems_version >= Gem::Version.new("${{ matrix.expected_rubygems_version }}"))'
|
||||||
|
|
||||||
testFixedRubygemsVersionUpgrades:
|
testFixedRubygemsVersionUpgrades:
|
||||||
name: "Test rubygems: version upgrades RubyGems to that version if the default is older"
|
name: "Test rubygems: version upgrades RubyGems to that version if the default is older"
|
||||||
|
|||||||
+2
-1
@@ -12,7 +12,8 @@ inputs:
|
|||||||
description: |
|
description: |
|
||||||
The version of RubyGems to use. Either 'default' (the default), 'latest', or a version number (e.g., 3.3.5).
|
The version of RubyGems to use. Either 'default' (the default), 'latest', or a version number (e.g., 3.3.5).
|
||||||
For 'default', no action is taken and the version of RubyGems that comes with Ruby by default is used.
|
For 'default', no action is taken and the version of RubyGems that comes with Ruby by default is used.
|
||||||
For 'latest', `gem update --system` is run to update to the latest RubyGems version.
|
For 'latest', `gem update --system` is run to update to the latest compatible RubyGems version.
|
||||||
|
Ruby head/master builds and Ruby 2.2 and earlier will not be updated.
|
||||||
Similarly, if a version number is given, `gem update --system <version>` is run to update to that version of RubyGems, as long as that version is newer than the one provided by default.
|
Similarly, if a version number is given, `gem update --system <version>` is run to update to that version of RubyGems, as long as that version is newer than the one provided by default.
|
||||||
bundler:
|
bundler:
|
||||||
description: |
|
description: |
|
||||||
|
|||||||
+28
-3
@@ -65086,11 +65086,12 @@ __nccwpck_require__.r(__webpack_exports__);
|
|||||||
/* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
|
/* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
|
||||||
/* harmony export */ "rubygemsUpdate": () => (/* binding */ rubygemsUpdate)
|
/* harmony export */ "rubygemsUpdate": () => (/* binding */ rubygemsUpdate)
|
||||||
/* harmony export */ });
|
/* harmony export */ });
|
||||||
|
const common = __nccwpck_require__(3143)
|
||||||
const path = __nccwpck_require__(1017)
|
const path = __nccwpck_require__(1017)
|
||||||
const exec = __nccwpck_require__(1514)
|
const exec = __nccwpck_require__(1514)
|
||||||
const semver = __nccwpck_require__(1383)
|
const semver = __nccwpck_require__(1383)
|
||||||
|
|
||||||
async function rubygemsUpdate(rubygemsVersionInput, rubyPrefix) {
|
async function rubygemsUpdate(rubygemsVersionInput, rubyPrefix, platform, engine, rubyVersion) {
|
||||||
const gem = path.join(rubyPrefix, 'bin', 'gem')
|
const gem = path.join(rubyPrefix, 'bin', 'gem')
|
||||||
|
|
||||||
let gemVersion = ''
|
let gemVersion = ''
|
||||||
@@ -65106,7 +65107,7 @@ async function rubygemsUpdate(rubygemsVersionInput, rubyPrefix) {
|
|||||||
|
|
||||||
if (rubygemsVersionInput === 'latest') {
|
if (rubygemsVersionInput === 'latest') {
|
||||||
console.log('Updating RubyGems to latest version')
|
console.log('Updating RubyGems to latest version')
|
||||||
await exec.exec(gem, ['update', '--system'])
|
await rubygemsLatest(gem, platform, engine, rubyVersion)
|
||||||
} else if (semver.gt(rubygemsVersionInput, gemVersion)) {
|
} else if (semver.gt(rubygemsVersionInput, gemVersion)) {
|
||||||
console.log(`Updating RubyGems to ${rubygemsVersionInput}`)
|
console.log(`Updating RubyGems to ${rubygemsVersionInput}`)
|
||||||
await exec.exec(gem, ['update', '--system', rubygemsVersionInput])
|
await exec.exec(gem, ['update', '--system', rubygemsVersionInput])
|
||||||
@@ -65117,6 +65118,30 @@ async function rubygemsUpdate(rubygemsVersionInput, rubyPrefix) {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Older RubyGems versions do not account for 'required_ruby_version' when
|
||||||
|
// running 'gem update --system', so we have to force a compatible version of
|
||||||
|
// rubygems-update. See https://github.com/ruby/setup-ruby/pull/551 and
|
||||||
|
// https://github.com/rubygems/rubygems/issues/7329
|
||||||
|
async function rubygemsLatest(gem, platform, engine, rubyVersion) {
|
||||||
|
if (engine === 'ruby') {
|
||||||
|
const floatVersion = common.floatVersion(rubyVersion)
|
||||||
|
if (common.isHeadVersion(rubyVersion)) {
|
||||||
|
console.log('Ruby master builds use included RubyGems')
|
||||||
|
} else if (floatVersion >= 3.0) {
|
||||||
|
await exec.exec(gem, ['update', '--system'])
|
||||||
|
} else if (floatVersion >= 2.6) {
|
||||||
|
await exec.exec(gem, ['update', '--system', '3.4.22'])
|
||||||
|
} else if (floatVersion >= 2.3) {
|
||||||
|
await exec.exec(gem, ['update', '--system', '3.3.27'])
|
||||||
|
} else {
|
||||||
|
console.log(`Cannot update RubyGems for Ruby version ${rubyVersion}`)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// non MRI Rubies (TruffleRuby and JRuby)
|
||||||
|
await exec.exec(gem, ['update', '--system'])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
|
|
||||||
@@ -65775,7 +65800,7 @@ async function setupRuby(options = {}) {
|
|||||||
const rubygemsInputSet = inputs['rubygems'] !== 'default'
|
const rubygemsInputSet = inputs['rubygems'] !== 'default'
|
||||||
if (rubygemsInputSet) {
|
if (rubygemsInputSet) {
|
||||||
await common.measure('Updating RubyGems', async () =>
|
await common.measure('Updating RubyGems', async () =>
|
||||||
rubygems.rubygemsUpdate(inputs['rubygems'], rubyPrefix))
|
rubygems.rubygemsUpdate(inputs['rubygems'], rubyPrefix, platform, engine, version))
|
||||||
}
|
}
|
||||||
|
|
||||||
// When setup-ruby is used by other actions, this allows code in them to run
|
// When setup-ruby is used by other actions, this allows code in them to run
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ export async function setupRuby(options = {}) {
|
|||||||
const rubygemsInputSet = inputs['rubygems'] !== 'default'
|
const rubygemsInputSet = inputs['rubygems'] !== 'default'
|
||||||
if (rubygemsInputSet) {
|
if (rubygemsInputSet) {
|
||||||
await common.measure('Updating RubyGems', async () =>
|
await common.measure('Updating RubyGems', async () =>
|
||||||
rubygems.rubygemsUpdate(inputs['rubygems'], rubyPrefix))
|
rubygems.rubygemsUpdate(inputs['rubygems'], rubyPrefix, platform, engine, version))
|
||||||
}
|
}
|
||||||
|
|
||||||
// When setup-ruby is used by other actions, this allows code in them to run
|
// When setup-ruby is used by other actions, this allows code in them to run
|
||||||
|
|||||||
+27
-2
@@ -1,8 +1,9 @@
|
|||||||
|
const common = require('./common')
|
||||||
const path = require('path')
|
const path = require('path')
|
||||||
const exec = require('@actions/exec')
|
const exec = require('@actions/exec')
|
||||||
const semver = require('semver')
|
const semver = require('semver')
|
||||||
|
|
||||||
export async function rubygemsUpdate(rubygemsVersionInput, rubyPrefix) {
|
export async function rubygemsUpdate(rubygemsVersionInput, rubyPrefix, platform, engine, rubyVersion) {
|
||||||
const gem = path.join(rubyPrefix, 'bin', 'gem')
|
const gem = path.join(rubyPrefix, 'bin', 'gem')
|
||||||
|
|
||||||
let gemVersion = ''
|
let gemVersion = ''
|
||||||
@@ -18,7 +19,7 @@ export async function rubygemsUpdate(rubygemsVersionInput, rubyPrefix) {
|
|||||||
|
|
||||||
if (rubygemsVersionInput === 'latest') {
|
if (rubygemsVersionInput === 'latest') {
|
||||||
console.log('Updating RubyGems to latest version')
|
console.log('Updating RubyGems to latest version')
|
||||||
await exec.exec(gem, ['update', '--system'])
|
await rubygemsLatest(gem, platform, engine, rubyVersion)
|
||||||
} else if (semver.gt(rubygemsVersionInput, gemVersion)) {
|
} else if (semver.gt(rubygemsVersionInput, gemVersion)) {
|
||||||
console.log(`Updating RubyGems to ${rubygemsVersionInput}`)
|
console.log(`Updating RubyGems to ${rubygemsVersionInput}`)
|
||||||
await exec.exec(gem, ['update', '--system', rubygemsVersionInput])
|
await exec.exec(gem, ['update', '--system', rubygemsVersionInput])
|
||||||
@@ -28,3 +29,27 @@ export async function rubygemsUpdate(rubygemsVersionInput, rubyPrefix) {
|
|||||||
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Older RubyGems versions do not account for 'required_ruby_version' when
|
||||||
|
// running 'gem update --system', so we have to force a compatible version of
|
||||||
|
// rubygems-update. See https://github.com/ruby/setup-ruby/pull/551 and
|
||||||
|
// https://github.com/rubygems/rubygems/issues/7329
|
||||||
|
async function rubygemsLatest(gem, platform, engine, rubyVersion) {
|
||||||
|
if (engine === 'ruby') {
|
||||||
|
const floatVersion = common.floatVersion(rubyVersion)
|
||||||
|
if (common.isHeadVersion(rubyVersion)) {
|
||||||
|
console.log('Ruby master builds use included RubyGems')
|
||||||
|
} else if (floatVersion >= 3.0) {
|
||||||
|
await exec.exec(gem, ['update', '--system'])
|
||||||
|
} else if (floatVersion >= 2.6) {
|
||||||
|
await exec.exec(gem, ['update', '--system', '3.4.22'])
|
||||||
|
} else if (floatVersion >= 2.3) {
|
||||||
|
await exec.exec(gem, ['update', '--system', '3.3.27'])
|
||||||
|
} else {
|
||||||
|
console.log(`Cannot update RubyGems for Ruby version ${rubyVersion}`)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// non MRI Rubies (TruffleRuby and JRuby)
|
||||||
|
await exec.exec(gem, ['update', '--system'])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user