mirror of
https://github.com/ruby/setup-ruby.git
synced 2026-09-13 14:34:21 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2a7b30092b | ||
|
|
78876b7c88 | ||
|
|
3ec1ec0529 | ||
|
|
45dc484f8a |
+1
-1
@@ -206,7 +206,7 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
|
||||
await exec.exec('bundle', ['install', '--jobs', '4'])
|
||||
|
||||
// @actions/cache only allows to save for non-existing keys
|
||||
if (cachedKey !== key) {
|
||||
if (!common.isExactCacheKeyMatch(key, cachedKey)) {
|
||||
if (cachedKey) { // existing cache but Gemfile.lock differs, clean old gems
|
||||
await exec.exec('bundle', ['clean'])
|
||||
}
|
||||
|
||||
@@ -412,3 +412,15 @@ export async function setupJavaHome(rubyPrefix) {
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// Determines if two keys are an exact match for the purposes of cache matching
|
||||
// Specifically, this is a case-insensitive match that ignores accents
|
||||
// From actions/cache@v3 src/utils/actionUtils.ts (MIT)
|
||||
export function isExactCacheKeyMatch(key, cacheKey) {
|
||||
return !!(
|
||||
cacheKey &&
|
||||
cacheKey.localeCompare(key, undefined, {
|
||||
sensitivity: 'accent'
|
||||
}) === 0
|
||||
);
|
||||
}
|
||||
|
||||
+15
-2
@@ -220,7 +220,7 @@ async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, b
|
||||
await exec.exec('bundle', ['install', '--jobs', '4'])
|
||||
|
||||
// @actions/cache only allows to save for non-existing keys
|
||||
if (cachedKey !== key) {
|
||||
if (!common.isExactCacheKeyMatch(key, cachedKey)) {
|
||||
if (cachedKey) { // existing cache but Gemfile.lock differs, clean old gems
|
||||
await exec.exec('bundle', ['clean'])
|
||||
}
|
||||
@@ -299,6 +299,7 @@ __nccwpck_require__.r(__webpack_exports__);
|
||||
/* harmony export */ isBundler1Default: () => (/* binding */ isBundler1Default),
|
||||
/* harmony export */ isBundler2Default: () => (/* binding */ isBundler2Default),
|
||||
/* harmony export */ isBundler2dot2Default: () => (/* binding */ isBundler2dot2Default),
|
||||
/* harmony export */ isExactCacheKeyMatch: () => (/* binding */ isExactCacheKeyMatch),
|
||||
/* harmony export */ isHeadVersion: () => (/* binding */ isHeadVersion),
|
||||
/* harmony export */ isSelfHostedRunner: () => (/* binding */ isSelfHostedRunner),
|
||||
/* harmony export */ isStableVersion: () => (/* binding */ isStableVersion),
|
||||
@@ -730,6 +731,18 @@ async function setupJavaHome(rubyPrefix) {
|
||||
})
|
||||
}
|
||||
|
||||
// Determines if two keys are an exact match for the purposes of cache matching
|
||||
// Specifically, this is a case-insensitive match that ignores accents
|
||||
// From actions/cache@v3 src/utils/actionUtils.ts (MIT)
|
||||
function isExactCacheKeyMatch(key, cacheKey) {
|
||||
return !!(
|
||||
cacheKey &&
|
||||
cacheKey.localeCompare(key, undefined, {
|
||||
sensitivity: 'accent'
|
||||
}) === 0
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -42919,7 +42932,7 @@ function expand(str, isTop) {
|
||||
var isOptions = m.body.indexOf(',') >= 0;
|
||||
if (!isSequence && !isOptions) {
|
||||
// {a},b}
|
||||
if (m.post.match(/,.*\}/)) {
|
||||
if (m.post.match(/,(?!,).*\}/)) {
|
||||
str = m.pre + '{' + m.body + escClose + m.post;
|
||||
return expand(str);
|
||||
}
|
||||
|
||||
@@ -283,9 +283,9 @@ balanced-match@^1.0.0:
|
||||
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
|
||||
|
||||
brace-expansion@^1.1.7:
|
||||
version "1.1.11"
|
||||
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
|
||||
integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
|
||||
version "1.1.12"
|
||||
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
|
||||
integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
|
||||
dependencies:
|
||||
balanced-match "^1.0.0"
|
||||
concat-map "0.0.1"
|
||||
@@ -376,13 +376,14 @@ fast-xml-parser@^5.0.7:
|
||||
strnum "^2.1.0"
|
||||
|
||||
form-data@^2.5.0:
|
||||
version "2.5.3"
|
||||
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.3.tgz#f9bcf87418ce748513c0c3494bb48ec270c97acc"
|
||||
integrity sha512-XHIrMD0NpDrNM/Ckf7XJiBbLl57KEhT3+i3yY+eWm+cqYZJQTZrKo8Y8AWKnuV5GT4scfuUGt9LzNoIx3dU1nQ==
|
||||
version "2.5.5"
|
||||
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.5.tgz#a5f6364ad7e4e67e95b4a07e2d8c6f711c74f624"
|
||||
integrity sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==
|
||||
dependencies:
|
||||
asynckit "^0.4.0"
|
||||
combined-stream "^1.0.8"
|
||||
es-set-tostringtag "^2.1.0"
|
||||
hasown "^2.0.2"
|
||||
mime-types "^2.1.35"
|
||||
safe-buffer "^5.2.1"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user