From 4d8ce7b87dee9ec155fc224fdfc9e9f829326090 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Thu, 3 Mar 2022 14:59:41 +0100 Subject: [PATCH] ruby-head now sets a proper ABI version https://bugs.ruby-lang.org/issues/18249 --- bundler.js | 3 +-- dist/index.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bundler.js b/bundler.js index 41030d2..63d0dd1 100644 --- a/bundler.js +++ b/bundler.js @@ -192,8 +192,7 @@ async function computeBaseKey(platform, engine, version, lockFile, cacheVersion) if (common.isHeadVersion(version)) { if (engine !== 'jruby') { - // CRuby dev versions do not change the ABI version when the ABI changes, so use the commit as the ABI version - let print_abi = engine === 'ruby' ? 'print RUBY_REVISION' : "print RbConfig::CONFIG['ruby_version']" + let print_abi = "print RbConfig::CONFIG['ruby_version']" let abi = '' await exec.exec('ruby', ['-e', print_abi], { silent: true, diff --git a/dist/index.js b/dist/index.js index a452859..609aff5 100644 --- a/dist/index.js +++ b/dist/index.js @@ -206,8 +206,7 @@ async function computeBaseKey(platform, engine, version, lockFile, cacheVersion) if (common.isHeadVersion(version)) { if (engine !== 'jruby') { - // CRuby dev versions do not change the ABI version when the ABI changes, so use the commit as the ABI version - let print_abi = engine === 'ruby' ? 'print RUBY_REVISION' : "print RbConfig::CONFIG['ruby_version']" + let print_abi = "print RbConfig::CONFIG['ruby_version']" let abi = '' await exec.exec('ruby', ['-e', print_abi], { silent: true,