From 40bbc5ec66a5c5dcc09c6011be87727e76b2684f Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Sat, 11 Jul 2020 16:08:35 +0200 Subject: [PATCH] Also include the commit in the cache key for truffleruby-head * That way new caches can be created if the previous cache is for a different commit. --- dist/index.js | 2 +- index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/index.js b/dist/index.js index 0138e93..8d8804a 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2469,7 +2469,7 @@ async function bundleInstall(platform, engine, version) { async function computeBaseKey(platform, engine, version) { let baseKey = `setup-ruby-bundle-install-${platform}-${engine}-${version}` - if (engine === 'ruby' && common.isHeadVersion(version)) { + if (engine !== 'jruby' && common.isHeadVersion(version)) { let revision = ''; await exec.exec('ruby', ['-e', 'print RUBY_REVISION'], { silent: true, diff --git a/index.js b/index.js index 83e9d11..89f87a8 100644 --- a/index.js +++ b/index.js @@ -283,7 +283,7 @@ async function bundleInstall(platform, engine, version) { async function computeBaseKey(platform, engine, version) { let baseKey = `setup-ruby-bundle-install-${platform}-${engine}-${version}` - if (engine === 'ruby' && common.isHeadVersion(version)) { + if (engine !== 'jruby' && common.isHeadVersion(version)) { let revision = ''; await exec.exec('ruby', ['-e', 'print RUBY_REVISION'], { silent: true,