mirror of
				https://github.com/actions/cache.git
				synced 2025-11-04 13:29:10 +08:00 
			
		
		
		
	Merge branch 'main' into patch-1
This commit is contained in:
		@@ -6,7 +6,7 @@ This action allows caching dependencies and build outputs to improve workflow ex
 | 
			
		||||
 | 
			
		||||
## 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
 | 
			
		||||
### v3
 | 
			
		||||
 
 | 
			
		||||
@@ -28,4 +28,7 @@
 | 
			
		||||
 | 
			
		||||
### 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).
 | 
			
		||||
- 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.
 | 
			
		||||
 
 | 
			
		||||
@@ -215,23 +215,6 @@ test("getInputAsArray handles empty lines correctly", () => {
 | 
			
		||||
    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", () => {
 | 
			
		||||
    testUtils.setInput(
 | 
			
		||||
        "foo",
 | 
			
		||||
@@ -240,11 +223,11 @@ test("getInputAsArray removes spaces after ! at the beginning", () => {
 | 
			
		||||
    expect(actionUtils.getInputAsArray("foo")).toEqual([
 | 
			
		||||
        "!bar",
 | 
			
		||||
        "!baz",
 | 
			
		||||
        "!quux",
 | 
			
		||||
        "!qux",
 | 
			
		||||
        "!waldo",
 | 
			
		||||
        "!quux",
 | 
			
		||||
        "corge",
 | 
			
		||||
        "grault! garply"
 | 
			
		||||
        "grault! garply",
 | 
			
		||||
        "!waldo"
 | 
			
		||||
    ]);
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -147,7 +147,7 @@ test("restore with no key", async () => {
 | 
			
		||||
test("restore with too many keys should fail", async () => {
 | 
			
		||||
    const path = "node_modules";
 | 
			
		||||
    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({
 | 
			
		||||
        path: path,
 | 
			
		||||
        key,
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										3
									
								
								dist/restore/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								dist/restore/index.js
									
									
									
									
										vendored
									
									
								
							@@ -38437,8 +38437,7 @@ function getInputAsArray(name, options) {
 | 
			
		||||
        .getInput(name, options)
 | 
			
		||||
        .split("\n")
 | 
			
		||||
        .map(s => s.replace(/^!\s+/, "!").trim())
 | 
			
		||||
        .filter(x => x !== "")
 | 
			
		||||
        .sort();
 | 
			
		||||
        .filter(x => x !== "");
 | 
			
		||||
}
 | 
			
		||||
exports.getInputAsArray = getInputAsArray;
 | 
			
		||||
function getInputAsInt(name, options) {
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										3
									
								
								dist/save/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								dist/save/index.js
									
									
									
									
										vendored
									
									
								
							@@ -38437,8 +38437,7 @@ function getInputAsArray(name, options) {
 | 
			
		||||
        .getInput(name, options)
 | 
			
		||||
        .split("\n")
 | 
			
		||||
        .map(s => s.replace(/^!\s+/, "!").trim())
 | 
			
		||||
        .filter(x => x !== "")
 | 
			
		||||
        .sort();
 | 
			
		||||
        .filter(x => x !== "");
 | 
			
		||||
}
 | 
			
		||||
exports.getInputAsArray = getInputAsArray;
 | 
			
		||||
function getInputAsInt(name, options) {
 | 
			
		||||
 
 | 
			
		||||
@@ -332,7 +332,7 @@ If using `npm config` to retrieve the cache directory, ensure you run [actions/s
 | 
			
		||||
- name: restore lerna
 | 
			
		||||
  uses: actions/cache@v3
 | 
			
		||||
  with:
 | 
			
		||||
    path: **/node_modules
 | 
			
		||||
    path: '**/node_modules'
 | 
			
		||||
    key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										4
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							@@ -1,12 +1,12 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "cache",
 | 
			
		||||
  "version": "3.0.8",
 | 
			
		||||
  "version": "3.0.9",
 | 
			
		||||
  "lockfileVersion": 2,
 | 
			
		||||
  "requires": true,
 | 
			
		||||
  "packages": {
 | 
			
		||||
    "": {
 | 
			
		||||
      "name": "cache",
 | 
			
		||||
      "version": "3.0.8",
 | 
			
		||||
      "version": "3.0.9",
 | 
			
		||||
      "license": "MIT",
 | 
			
		||||
      "dependencies": {
 | 
			
		||||
        "@actions/cache": "^3.0.4",
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "cache",
 | 
			
		||||
  "version": "3.0.8",
 | 
			
		||||
  "version": "3.0.9",
 | 
			
		||||
  "private": true,
 | 
			
		||||
  "description": "Cache dependencies and build outputs",
 | 
			
		||||
  "main": "dist/restore/index.js",
 | 
			
		||||
 
 | 
			
		||||
@@ -62,8 +62,7 @@ export function getInputAsArray(
 | 
			
		||||
        .getInput(name, options)
 | 
			
		||||
        .split("\n")
 | 
			
		||||
        .map(s => s.replace(/^!\s+/, "!").trim())
 | 
			
		||||
        .filter(x => x !== "")
 | 
			
		||||
        .sort();
 | 
			
		||||
        .filter(x => x !== "");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function getInputAsInt(
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user