Merge branch 'main' into patch-1

This commit is contained in:
ELHoussineT 2022-10-03 10:16:35 +02:00 committed by GitHub
commit f85d12c3b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 16 additions and 33 deletions

View file

@ -6,7 +6,7 @@ This action allows caching dependencies and build outputs to improve workflow ex
## Documentation ## Documentation
See ["Caching dependencies to speed up workflows"](https://help.github.com/github/automating-your-workflow-with-github-actions/caching-dependencies-to-speed-up-workflows). See ["Caching dependencies to speed up workflows"](https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows).
## What's New ## What's New
### v3 ### v3

View file

@ -28,4 +28,7 @@
### 3.0.8 ### 3.0.8
- Fix zstd not working for windows on gnu tar in issues [#888](https://github.com/actions/cache/issues/888) and [#891](https://github.com/actions/cache/issues/891). - Fix zstd not working for windows on gnu tar in issues [#888](https://github.com/actions/cache/issues/888) and [#891](https://github.com/actions/cache/issues/891).
- Allowing users to provide a custom timeout as input for aborting download of a cache segment using an environment variable `SEGMENT_DOWNLOAD_TIMEOUT_MIN`. Default is 60 minutes. - Allowing users to provide a custom timeout as input for aborting download of a cache segment using an environment variable `SEGMENT_DOWNLOAD_TIMEOUT_MIN`. Default is 60 minutes.
### 3.0.9
- Enhanced the warning message for cache unavailablity in case of GHES.

View file

@ -215,23 +215,6 @@ test("getInputAsArray handles empty lines correctly", () => {
expect(actionUtils.getInputAsArray("foo")).toEqual(["bar", "baz"]); expect(actionUtils.getInputAsArray("foo")).toEqual(["bar", "baz"]);
}); });
test("getInputAsArray sorts files correctly", () => {
testUtils.setInput(
"foo",
"bar\n!baz\nwaldo\nqux\nquux\ncorge\ngrault\ngarply"
);
expect(actionUtils.getInputAsArray("foo")).toEqual([
"!baz",
"bar",
"corge",
"garply",
"grault",
"quux",
"qux",
"waldo"
]);
});
test("getInputAsArray removes spaces after ! at the beginning", () => { test("getInputAsArray removes spaces after ! at the beginning", () => {
testUtils.setInput( testUtils.setInput(
"foo", "foo",
@ -240,11 +223,11 @@ test("getInputAsArray removes spaces after ! at the beginning", () => {
expect(actionUtils.getInputAsArray("foo")).toEqual([ expect(actionUtils.getInputAsArray("foo")).toEqual([
"!bar", "!bar",
"!baz", "!baz",
"!quux",
"!qux", "!qux",
"!waldo", "!quux",
"corge", "corge",
"grault! garply" "grault! garply",
"!waldo"
]); ]);
}); });

View file

@ -147,7 +147,7 @@ test("restore with no key", async () => {
test("restore with too many keys should fail", async () => { test("restore with too many keys should fail", async () => {
const path = "node_modules"; const path = "node_modules";
const key = "node-test"; const key = "node-test";
const restoreKeys = [...Array(20).keys()].map(x => x.toString()).sort(); const restoreKeys = [...Array(20).keys()].map(x => x.toString());
testUtils.setInputs({ testUtils.setInputs({
path: path, path: path,
key, key,

View file

@ -38437,8 +38437,7 @@ function getInputAsArray(name, options) {
.getInput(name, options) .getInput(name, options)
.split("\n") .split("\n")
.map(s => s.replace(/^!\s+/, "!").trim()) .map(s => s.replace(/^!\s+/, "!").trim())
.filter(x => x !== "") .filter(x => x !== "");
.sort();
} }
exports.getInputAsArray = getInputAsArray; exports.getInputAsArray = getInputAsArray;
function getInputAsInt(name, options) { function getInputAsInt(name, options) {

3
dist/save/index.js vendored
View file

@ -38437,8 +38437,7 @@ function getInputAsArray(name, options) {
.getInput(name, options) .getInput(name, options)
.split("\n") .split("\n")
.map(s => s.replace(/^!\s+/, "!").trim()) .map(s => s.replace(/^!\s+/, "!").trim())
.filter(x => x !== "") .filter(x => x !== "");
.sort();
} }
exports.getInputAsArray = getInputAsArray; exports.getInputAsArray = getInputAsArray;
function getInputAsInt(name, options) { function getInputAsInt(name, options) {

View file

@ -332,7 +332,7 @@ If using `npm config` to retrieve the cache directory, ensure you run [actions/s
- name: restore lerna - name: restore lerna
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: **/node_modules path: '**/node_modules'
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }} key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
``` ```

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "cache", "name": "cache",
"version": "3.0.8", "version": "3.0.9",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "cache", "name": "cache",
"version": "3.0.8", "version": "3.0.9",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@actions/cache": "^3.0.4", "@actions/cache": "^3.0.4",

View file

@ -1,6 +1,6 @@
{ {
"name": "cache", "name": "cache",
"version": "3.0.8", "version": "3.0.9",
"private": true, "private": true,
"description": "Cache dependencies and build outputs", "description": "Cache dependencies and build outputs",
"main": "dist/restore/index.js", "main": "dist/restore/index.js",

View file

@ -62,8 +62,7 @@ export function getInputAsArray(
.getInput(name, options) .getInput(name, options)
.split("\n") .split("\n")
.map(s => s.replace(/^!\s+/, "!").trim()) .map(s => s.replace(/^!\s+/, "!").trim())
.filter(x => x !== "") .filter(x => x !== "");
.sort();
} }
export function getInputAsInt( export function getInputAsInt(