actions/setup-ruby
1
0
Fork 0
mirror of https://github.com/ruby/setup-ruby.git synced 2026-09-14 06:54:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ignore Bundler dev version in Gemfile.lock

Browse Source 
* Fixes https://github.com/ruby/setup-ruby/issues/394
This commit is contained in:
Benoit Daloze
2022-11-22 16:22:30 +01:00
parent c4fe7bd15d
commit 4887fd8753
5 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/index.js
Generated Vendored
+10 -4
View File
@@ -8,6 +8,7 @@
__nccwpck_require__.r(__webpack_exports__);
/* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
/* harmony export */ "DEFAULT_CACHE_VERSION": () => (/* binding */ DEFAULT_CACHE_VERSION),
/* harmony export */ "BUNDLER_VERSION_REGEXP": () => (/* binding */ BUNDLER_VERSION_REGEXP),
/* harmony export */ "detectGemfiles": () => (/* binding */ detectGemfiles),
/* harmony export */ "installBundler": () => (/* binding */ installBundler),
/* harmony export */ "bundleInstall": () => (/* binding */ bundleInstall)
@@ -20,6 +21,7 @@ const cache = __nccwpck_require__(7799)
const common = __nccwpck_require__(4717)
const DEFAULT_CACHE_VERSION = '0'
const BUNDLER_VERSION_REGEXP = /^\d+(?:\.\d+){0,2}$/
// The returned gemfile is guaranteed to exist, the lockfile might not exist
function detectGemfiles() {
@@ -44,10 +46,14 @@ function readBundledWithFromGemfileLock(lockFile) {
const bundledWithLine = lines.findIndex(line => /^BUNDLED WITH$/.test(line.trim()))
if (bundledWithLine !== -1) {
const nextLine = lines[bundledWithLine+1]
if (nextLine && /^\d+/.test(nextLine.trim())) {
if (nextLine) {
const bundlerVersion = nextLine.trim()
console.log(`Using Bundler ${bundlerVersion} from ${lockFile} BUNDLED WITH ${bundlerVersion}`)
return bundlerVersion
if (BUNDLER_VERSION_REGEXP.test(bundlerVersion)) {
console.log(`Using Bundler ${bundlerVersion} from ${lockFile} BUNDLED WITH ${bundlerVersion}`)
return bundlerVersion
} else {
console.log(`Could not parse BUNDLED WITH version as a valid Bundler release, ignoring it: ${bundlerVersion}`)
}
}
}
}
@@ -109,7 +115,7 @@ async function installBundler(bundlerVersionInput, rubygemsInputSet, lockFile, p
bundlerVersion = '2'
}
if (/^\d+(?:\.\d+){0,2}$/.test(bundlerVersion)) {
if (BUNDLER_VERSION_REGEXP.test(bundlerVersion)) {
// OK - input is a 1, 2, or 3 part version number
} else {
throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)