Consider truffleruby preview releases to be stable versions

eregon · eregon · commit d2b39ad0b52e · 2023-04-28T17:06:17.000+02:00
diff --git a/bundler.js b/bundler.js
@@ -80,7 +80,7 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
 
   if (bundlerVersion === 'default') {
     if (common.isBundler2dot2Default(engine, rubyVersion)) {
-      if (common.windows && engine === 'ruby' && (common.isStableVersion(rubyVersion) || rubyVersion === 'head')) {
+      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'
diff --git a/common.js b/common.js
@@ -70,8 +70,12 @@ export function isHeadVersion(rubyVersion) {
   return ['head', 'debug',  'mingw', 'mswin', 'ucrt'].includes(rubyVersion)
 }
 
-export function isStableVersion(rubyVersion) {
-  return /^\d+(\.\d+)*$/.test(rubyVersion)
+export function isStableVersion(engine, rubyVersion) {
+  if (engine.startsWith('truffleruby')) {
+    return /^\d+(\.\d+)*(-preview\d+)?$/.test(rubyVersion)
+  } else {
+    return /^\d+(\.\d+)*$/.test(rubyVersion)
+  }
 }
 
 export function hasBundlerDefaultGem(engine, rubyVersion) {
diff --git a/dist/index.js b/dist/index.js
diff --git a/index.js b/index.js
@@ -145,7 +145,7 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, parsedVe
   if (!engineVersions.includes(parsedVersion)) {
     const latestToFirstVersion = engineVersions.slice().reverse()
     // Try to match stable versions first, so an empty version (engine-only) matches the latest stable version
-    let found = latestToFirstVersion.find(v => common.isStableVersion(v) && v.startsWith(parsedVersion))
+    let found = latestToFirstVersion.find(v => common.isStableVersion(engine, v) && v.startsWith(parsedVersion))
     if (!found) {
       // Exclude head versions, they must be exact matches
       found = latestToFirstVersion.find(v => !common.isHeadVersion(v) && v.startsWith(parsedVersion))

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,12 @@ export function isHeadVersion(rubyVersion) {`
`70`	`70`	`return ['head', 'debug', 'mingw', 'mswin', 'ucrt'].includes(rubyVersion)`
`71`	`71`	`}`
`72`	`72`
`73`		`-export function isStableVersion(rubyVersion) {`
`74`		`- return /^\d+(\.\d+)*$/.test(rubyVersion)`
	`73`	`+export function isStableVersion(engine, rubyVersion) {`
	`74`	`+ if (engine.startsWith('truffleruby')) {`
	`75`	`+ return /^\d+(\.\d+)*(-preview\d+)?$/.test(rubyVersion)`
	`76`	`+ } else {`
	`77`	`+ return /^\d+(\.\d+)*$/.test(rubyVersion)`
	`78`	`+ }`
`75`	`79`	`}`
`76`	`80`
`77`	`81`	`export function hasBundlerDefaultGem(engine, rubyVersion) {`