From ae403e8ff49a312bccd0dadfe446fd8e72ad45f5 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Mon, 22 Aug 2022 15:03:08 -0500 Subject: [PATCH] Don't install Bundler on Windows mingw, mswin & ucrt builds --- bundler.js | 2 +- dist/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundler.js b/bundler.js index df27a00..3e86c07 100644 --- a/bundler.js +++ b/bundler.js @@ -72,7 +72,7 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock if (bundlerVersion === 'default') { if (common.isBundler2dot2Default(engine, rubyVersion)) { - if (common.windows && engine === 'ruby') { + if (common.windows && engine === 'ruby' && (common.isStableVersion(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/dist/index.js b/dist/index.js index a0f8eea..67d436d 100644 --- a/dist/index.js +++ b/dist/index.js @@ -86,7 +86,7 @@ async function installBundler(bundlerVersionInput, rubygemsInputSet, lockFile, p if (bundlerVersion === 'default') { if (common.isBundler2dot2Default(engine, rubyVersion)) { - if (common.windows && engine === 'ruby') { + if (common.windows && engine === 'ruby' && (common.isStableVersion(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'