diff --git a/common.js b/common.js index 4334416..a10c0e1 100644 --- a/common.js +++ b/common.js @@ -59,6 +59,14 @@ function findUbuntuVersion() { } } +export function getImageOS() { + const imageOS = process.env['ImageOS'] + if (!imageOS) { + throw new Error('The environment variable ImageOS must be set') + } + return imageOS +} + export function shouldExtractInToolCache(engine, version) { return engine === 'ruby' && !isHeadVersion(version) } diff --git a/dist/index.js b/dist/index.js index d187268..ed65049 100644 --- a/dist/index.js +++ b/dist/index.js @@ -32098,6 +32098,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isHeadVersion", function() { return isHeadVersion; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hashFile", function() { return hashFile; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getVirtualEnvironmentName", function() { return getVirtualEnvironmentName; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getImageOS", function() { return getImageOS; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "shouldExtractInToolCache", function() { return shouldExtractInToolCache; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getToolCacheRubyPrefix", function() { return getToolCacheRubyPrefix; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "win2nix", function() { return win2nix; }); @@ -32163,6 +32164,14 @@ function findUbuntuVersion() { } } +function getImageOS() { + const imageOS = process.env['ImageOS'] + if (!imageOS) { + throw new Error('The environment variable ImageOS must be set') + } + return imageOS +} + function shouldExtractInToolCache(engine, version) { return engine === 'ruby' && !isHeadVersion(version) } @@ -51445,7 +51454,7 @@ async function bundleInstall(gemfile, lockFile, platform, engine, version) { } async function computeBaseKey(platform, engine, version, lockFile) { - let key = `setup-ruby-bundler-cache-v2-${platform}-${engine}-${version}` + let key = `setup-ruby-bundler-cache-v2-${common.getImageOS()}-${engine}-${version}` if (engine !== 'jruby' && common.isHeadVersion(version)) { let revision = ''; diff --git a/index.js b/index.js index 3e8c940..096b9d3 100644 --- a/index.js +++ b/index.js @@ -293,7 +293,7 @@ async function bundleInstall(gemfile, lockFile, platform, engine, version) { } async function computeBaseKey(platform, engine, version, lockFile) { - let key = `setup-ruby-bundler-cache-v2-${platform}-${engine}-${version}` + let key = `setup-ruby-bundler-cache-v2-${common.getImageOS()}-${engine}-${version}` if (engine !== 'jruby' && common.isHeadVersion(version)) { let revision = '';