Skip to content

Commit f85d12c

Browse files
authored
Merge branch 'main' into patch-1
2 parents 98044e4 + edc4989 commit f85d12c

File tree

10 files changed

+16
-33
lines changed

10 files changed

+16
-33
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This action allows caching dependencies and build outputs to improve workflow ex
66

77
## Documentation
88

9-
See ["Caching dependencies to speed up workflows"](https://help.github.com/github/automating-your-workflow-with-github-actions/caching-dependencies-to-speed-up-workflows).
9+
See ["Caching dependencies to speed up workflows"](https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows).
1010

1111
## What's New
1212
### v3

RELEASES.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,7 @@
2828

2929
### 3.0.8
3030
- 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).
31-
- 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.
31+
- 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.
32+
33+
### 3.0.9
34+
- Enhanced the warning message for cache unavailablity in case of GHES.

__tests__/actionUtils.test.ts

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -215,23 +215,6 @@ test("getInputAsArray handles empty lines correctly", () => {
215215
expect(actionUtils.getInputAsArray("foo")).toEqual(["bar", "baz"]);
216216
});
217217

218-
test("getInputAsArray sorts files correctly", () => {
219-
testUtils.setInput(
220-
"foo",
221-
"bar\n!baz\nwaldo\nqux\nquux\ncorge\ngrault\ngarply"
222-
);
223-
expect(actionUtils.getInputAsArray("foo")).toEqual([
224-
"!baz",
225-
"bar",
226-
"corge",
227-
"garply",
228-
"grault",
229-
"quux",
230-
"qux",
231-
"waldo"
232-
]);
233-
});
234-
235218
test("getInputAsArray removes spaces after ! at the beginning", () => {
236219
testUtils.setInput(
237220
"foo",
@@ -240,11 +223,11 @@ test("getInputAsArray removes spaces after ! at the beginning", () => {
240223
expect(actionUtils.getInputAsArray("foo")).toEqual([
241224
"!bar",
242225
"!baz",
243-
"!quux",
244226
"!qux",
245-
"!waldo",
227+
"!quux",
246228
"corge",
247-
"grault! garply"
229+
"grault! garply",
230+
"!waldo"
248231
]);
249232
});
250233

__tests__/restore.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ test("restore with no key", async () => {
147147
test("restore with too many keys should fail", async () => {
148148
const path = "node_modules";
149149
const key = "node-test";
150-
const restoreKeys = [...Array(20).keys()].map(x => x.toString()).sort();
150+
const restoreKeys = [...Array(20).keys()].map(x => x.toString());
151151
testUtils.setInputs({
152152
path: path,
153153
key,

dist/restore/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38437,8 +38437,7 @@ function getInputAsArray(name, options) {
3843738437
.getInput(name, options)
3843838438
.split("\n")
3843938439
.map(s => s.replace(/^!\s+/, "!").trim())
38440-
.filter(x => x !== "")
38441-
.sort();
38440+
.filter(x => x !== "");
3844238441
}
3844338442
exports.getInputAsArray = getInputAsArray;
3844438443
function getInputAsInt(name, options) {

dist/save/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38437,8 +38437,7 @@ function getInputAsArray(name, options) {
3843738437
.getInput(name, options)
3843838438
.split("\n")
3843938439
.map(s => s.replace(/^!\s+/, "!").trim())
38440-
.filter(x => x !== "")
38441-
.sort();
38440+
.filter(x => x !== "");
3844238441
}
3844338442
exports.getInputAsArray = getInputAsArray;
3844438443
function getInputAsInt(name, options) {

examples.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ If using `npm config` to retrieve the cache directory, ensure you run [actions/s
332332
- name: restore lerna
333333
uses: actions/cache@v3
334334
with:
335-
path: **/node_modules
335+
path: '**/node_modules'
336336
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
337337
```
338338

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cache",
3-
"version": "3.0.8",
3+
"version": "3.0.9",
44
"private": true,
55
"description": "Cache dependencies and build outputs",
66
"main": "dist/restore/index.js",

src/utils/actionUtils.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ export function getInputAsArray(
6262
.getInput(name, options)
6363
.split("\n")
6464
.map(s => s.replace(/^!\s+/, "!").trim())
65-
.filter(x => x !== "")
66-
.sort();
65+
.filter(x => x !== "");
6766
}
6867

6968
export function getInputAsInt(

0 commit comments

Comments
 (0)