diff --git a/dist/restore/index.js b/dist/restore/index.js index 7131601..53b8945 100644 --- a/dist/restore/index.js +++ b/dist/restore/index.js @@ -64224,7 +64224,7 @@ class CacheConfig { } } } - hasher.update(JSON.stringify(sort_object(parsed))); + hasher.update(JSON.stringify(parsed)); parsedKeyFiles.push(cargo_manifest); } catch (_e) { // Fallback to caching them as regular file @@ -64247,7 +64247,7 @@ class CacheConfig { const packages = parsed.package.filter((p) => { "source" in p || "checksum" in p; }); - hasher.update(JSON.stringify(sort_object(packages))); + hasher.update(JSON.stringify(packages)); parsedKeyFiles.push(cargo_lock); } catch (_e) { // Fallback to caching them as regular file @@ -64387,23 +64387,6 @@ function sort_and_uniq(a) { return accumulator; }, []); } -function sort_object(o) { - if (Array.isArray(o)) { - return o.sort().map(sort_object); - } - else if (typeof o === 'object' && o != null) { - return Object - .keys(o) - .sort() - .reduce(function (a, k) { - a[k] = sort_object(o[k]); - return a; - }, {}); - } - else { - return o; - } -} ;// CONCATENATED MODULE: ./src/cleanup.ts diff --git a/dist/save/index.js b/dist/save/index.js index c6879ff..c65032b 100644 --- a/dist/save/index.js +++ b/dist/save/index.js @@ -64224,7 +64224,7 @@ class CacheConfig { } } } - hasher.update(JSON.stringify(sort_object(parsed))); + hasher.update(JSON.stringify(parsed)); parsedKeyFiles.push(cargo_manifest); } catch (_e) { // Fallback to caching them as regular file @@ -64247,7 +64247,7 @@ class CacheConfig { const packages = parsed.package.filter((p) => { "source" in p || "checksum" in p; }); - hasher.update(JSON.stringify(sort_object(packages))); + hasher.update(JSON.stringify(packages)); parsedKeyFiles.push(cargo_lock); } catch (_e) { // Fallback to caching them as regular file @@ -64387,23 +64387,6 @@ function sort_and_uniq(a) { return accumulator; }, []); } -function sort_object(o) { - if (Array.isArray(o)) { - return o.sort().map(sort_object); - } - else if (typeof o === 'object' && o != null) { - return Object - .keys(o) - .sort() - .reduce(function (a, k) { - a[k] = sort_object(o[k]); - return a; - }, {}); - } - else { - return o; - } -} ;// CONCATENATED MODULE: ./src/cleanup.ts diff --git a/src/config.ts b/src/config.ts index fc3d93e..b26c994 100644 --- a/src/config.ts +++ b/src/config.ts @@ -172,7 +172,7 @@ export class CacheConfig { } } - hasher.update(JSON.stringify(sort_object(parsed))); + hasher.update(JSON.stringify(parsed)); parsedKeyFiles.push(cargo_manifest); } catch (_e) { // Fallback to caching them as regular file @@ -200,7 +200,7 @@ export class CacheConfig { "source" in p || "checksum" in p }); - hasher.update(JSON.stringify(sort_object(packages))); + hasher.update(JSON.stringify(packages)); parsedKeyFiles.push(cargo_lock); } catch (_e) { // Fallback to caching them as regular file @@ -367,20 +367,3 @@ function sort_and_uniq(a: string[]) { [] ); } - -function sort_object(o: any): any { - if (Array.isArray(o)) { - return o.sort().map(sort_object); - } else if (typeof o === 'object' && o != null) { - return Object - .keys(o) - .sort() - .reduce(function(a: any, k) { - a[k] = sort_object(o[k]); - - return a; - }, {}); - } else { - return o; - } -}