Remove unused platform args from computeBaseKey
ref: https://github.com/ruby/setup-ruby/pull/473
This commit is contained in:
+2
-2
@@ -182,7 +182,7 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
|
|||||||
|
|
||||||
// cache key
|
// cache key
|
||||||
const paths = [cachePath]
|
const paths = [cachePath]
|
||||||
const baseKey = await computeBaseKey(platform, engine, rubyVersion, lockFile, cacheVersion)
|
const baseKey = await computeBaseKey(engine, rubyVersion, lockFile, cacheVersion)
|
||||||
const key = `${baseKey}-${await common.hashFile(lockFile)}`
|
const key = `${baseKey}-${await common.hashFile(lockFile)}`
|
||||||
// If only Gemfile.lock changes we can reuse part of the cache, and clean old gem versions below
|
// If only Gemfile.lock changes we can reuse part of the cache, and clean old gem versions below
|
||||||
const restoreKeys = [`${baseKey}-`]
|
const restoreKeys = [`${baseKey}-`]
|
||||||
@@ -232,7 +232,7 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
async function computeBaseKey(platform, engine, version, lockFile, cacheVersion) {
|
async function computeBaseKey(engine, version, lockFile, cacheVersion) {
|
||||||
const cwd = process.cwd()
|
const cwd = process.cwd()
|
||||||
const bundleWith = process.env['BUNDLE_WITH'] || ''
|
const bundleWith = process.env['BUNDLE_WITH'] || ''
|
||||||
const bundleWithout = process.env['BUNDLE_WITHOUT'] || ''
|
const bundleWithout = process.env['BUNDLE_WITHOUT'] || ''
|
||||||
|
|||||||
+2
-2
@@ -196,7 +196,7 @@ async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, b
|
|||||||
|
|
||||||
// cache key
|
// cache key
|
||||||
const paths = [cachePath]
|
const paths = [cachePath]
|
||||||
const baseKey = await computeBaseKey(platform, engine, rubyVersion, lockFile, cacheVersion)
|
const baseKey = await computeBaseKey(engine, rubyVersion, lockFile, cacheVersion)
|
||||||
const key = `${baseKey}-${await common.hashFile(lockFile)}`
|
const key = `${baseKey}-${await common.hashFile(lockFile)}`
|
||||||
// If only Gemfile.lock changes we can reuse part of the cache, and clean old gem versions below
|
// If only Gemfile.lock changes we can reuse part of the cache, and clean old gem versions below
|
||||||
const restoreKeys = [`${baseKey}-`]
|
const restoreKeys = [`${baseKey}-`]
|
||||||
@@ -246,7 +246,7 @@ async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, b
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
async function computeBaseKey(platform, engine, version, lockFile, cacheVersion) {
|
async function computeBaseKey(engine, version, lockFile, cacheVersion) {
|
||||||
const cwd = process.cwd()
|
const cwd = process.cwd()
|
||||||
const bundleWith = process.env['BUNDLE_WITH'] || ''
|
const bundleWith = process.env['BUNDLE_WITH'] || ''
|
||||||
const bundleWithout = process.env['BUNDLE_WITHOUT'] || ''
|
const bundleWithout = process.env['BUNDLE_WITHOUT'] || ''
|
||||||
|
|||||||
Reference in New Issue
Block a user