Merge pull request #887 from actions/pdotl-version-patch

Update toolkit's cache npm module to latest. Bump cache version to v3.0.6

.licenses/npm/@actions/cache.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@actions/cache"
-version: 3.0.0
+version: 3.0.1
 type: npm
 summary: 
 homepage: 

README.md

@@ -15,6 +15,8 @@ See ["Caching dependencies to speed up workflows"](https://help.github.com/githu
 * Updated the minimum runner version support from node 12 -> node 16.
 * Fixed avoiding empty cache save when no files are available for caching.
 * Fixed tar creation error while trying to create tar with path as `~/` home folder on `ubuntu-latest`.
+* Fixed zstd failing on amazon linux 2.0 runners
+* Fixed cache not working with github workspace directory or current directory
 
 Refer [here](https://github.com/actions/cache/blob/v2/README.md) for previous versions
 
@@ -81,6 +83,7 @@ Every programming language and framework has its own way of caching.
 See [Examples](examples.md) for a list of `actions/cache` implementations for use with:
 
 - [C# - NuGet](./examples.md#c---nuget)
+- [Clojure - Lein Deps](./examples.md#clojure---lein-deps)
 - [D - DUB](./examples.md#d---dub)
 - [Deno](./examples.md#deno)
 - [Elixir - Mix](./examples.md#elixir---mix)

RELEASES.md

@@ -17,4 +17,8 @@
 - Fixed tar creation error while trying to create tar with path as `~/` home folder on `ubuntu-latest`. ([issue](https://github.com/actions/cache/issues/689))
 
 ### 3.0.5
-- Removed error handling by consuming actions/cache 3.0 toolkit, Now cache server error handling will be done by toolkit. ([PR](https://github.com/actions/cache/pull/834))
+- Removed error handling by consuming actions/cache 3.0 toolkit, Now cache server error handling will be done by toolkit. ([PR](https://github.com/actions/cache/pull/834))
+
+### 3.0.6
+- Fixed [#809](https://github.com/actions/cache/issues/809) - zstd -d: no such file or directory error
+- Fixed [#833](https://github.com/actions/cache/issues/833) - cache doesn't work with github workspace directory

dist/restore/index.js

@@ -5470,7 +5470,6 @@ const buffer = __importStar(__webpack_require__(293));
 const fs = __importStar(__webpack_require__(747));
 const stream = __importStar(__webpack_require__(794));
 const util = __importStar(__webpack_require__(669));
-const timer = __importStar(__webpack_require__(581));
 const utils = __importStar(__webpack_require__(15));
 const constants_1 = __webpack_require__(931);
 const requestUtils_1 = __webpack_require__(899);
@@ -5661,14 +5660,10 @@ function downloadCacheStorageSDK(archiveLocation, archivePath, options) {
                     const segmentStart = downloadProgress.segmentOffset + downloadProgress.segmentSize;
                     const segmentSize = Math.min(maxSegmentSize, contentLength - segmentStart);
                     downloadProgress.nextSegment(segmentSize);
-                    const result = yield Promise.race([client.downloadToBuffer(segmentStart, segmentSize, {
+                    const result = yield client.downloadToBuffer(segmentStart, segmentSize, {
-                            concurrency: options.downloadConcurrency,
+                        concurrency: options.downloadConcurrency,
-                            onProgress: downloadProgress.onProgress()
+                        onProgress: downloadProgress.onProgress()
-                        }),
+                    });
-                        timer.setTimeout(60 * 60 * 1000, 'timeout')]);
-                    if (result === 'timeout') {
-                        throw new Error("Segment download timed out");
-                    }
                     fs.writeFileSync(fd, result);
                 }
             }
@@ -42354,12 +42349,7 @@ function clean(key)
 /* 578 */,
 /* 579 */,
 /* 580 */,
-/* 581 */
+/* 581 */,
-/***/ (function(module) {
-
-module.exports = require("timers/promises");
-
-/***/ }),
 /* 582 */
 /***/ (function(module) {
 

dist/save/index.js

@@ -5470,7 +5470,6 @@ const buffer = __importStar(__webpack_require__(293));
 const fs = __importStar(__webpack_require__(747));
 const stream = __importStar(__webpack_require__(794));
 const util = __importStar(__webpack_require__(669));
-const timer = __importStar(__webpack_require__(581));
 const utils = __importStar(__webpack_require__(15));
 const constants_1 = __webpack_require__(931);
 const requestUtils_1 = __webpack_require__(899);
@@ -5661,14 +5660,10 @@ function downloadCacheStorageSDK(archiveLocation, archivePath, options) {
                     const segmentStart = downloadProgress.segmentOffset + downloadProgress.segmentSize;
                     const segmentSize = Math.min(maxSegmentSize, contentLength - segmentStart);
                     downloadProgress.nextSegment(segmentSize);
-                    const result = yield Promise.race([client.downloadToBuffer(segmentStart, segmentSize, {
+                    const result = yield client.downloadToBuffer(segmentStart, segmentSize, {
-                            concurrency: options.downloadConcurrency,
+                        concurrency: options.downloadConcurrency,
-                            onProgress: downloadProgress.onProgress()
+                        onProgress: downloadProgress.onProgress()
-                        }),
+                    });
-                        timer.setTimeout(60 * 60 * 1000, 'timeout')]);
-                    if (result === 'timeout') {
-                        throw new Error("Segment download timed out");
-                    }
                     fs.writeFileSync(fd, result);
                 }
             }
@@ -42354,12 +42349,7 @@ function clean(key)
 /* 578 */,
 /* 579 */,
 /* 580 */,
-/* 581 */
+/* 581 */,
-/***/ (function(module) {
-
-module.exports = require("timers/promises");
-
-/***/ }),
 /* 582 */
 /***/ (function(module) {
 

examples.md

@@ -1,6 +1,7 @@
 # Examples
 
 - [C# - NuGet](#c---nuget)
+- [Clojure - Lein Deps](#clojure---lein-deps)
 - [D - DUB](#d---dub)
   - [POSIX](#posix)
   - [Windows](#windows)
@@ -80,6 +81,19 @@ steps:
         ${{ runner.os }}-nuget-
 ```
 
+## Clojure - Lein Deps
+
+```yaml
+- name: Cache lein project dependencies
+  uses: actions/cache@v3
+  with:
+    path: ~/.m2/repository
+    key: ${{ runner.os }}-clojure-${{ hashFiles('**/project.clj') }}
+    restore-keys: |
+      ${{ runner.os }}-clojure
+```
+
+
 ## D - DUB
 
 ### POSIX

package-lock.json

@@ -1,15 +1,15 @@
 {
   "name": "cache",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "cache",
-      "version": "3.0.5",
+      "version": "3.0.6",
       "license": "MIT",
       "dependencies": {
-        "@actions/cache": "file:actions-cache-3.0.1.tgz",
+        "@actions/cache": "^3.0.1",
         "@actions/core": "^1.7.0",
         "@actions/exec": "^1.1.1",
         "@actions/io": "^1.1.2"
@@ -37,9 +37,8 @@
     },
     "node_modules/@actions/cache": {
       "version": "3.0.1",
-      "resolved": "file:actions-cache-3.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.0.1.tgz",
-      "integrity": "sha512-ucvw0xvFpe0/vfNQ/rc11ste0nidCdBAJ5j5F01BxBqjxmGH2doVzfPlqSIGhcN7wKI074x2ATb9+7HSrTqGHg==",
+      "integrity": "sha512-z4cbwCuzyZHQ3Y3AyQEFb+WQneC1wcOWfjrKxhulGkbXBLiMH/Uga2hknNEgOY16XaDZ7hArYaY3nUxE7IzqLQ==",
-      "license": "MIT",
       "dependencies": {
         "@actions/core": "^1.2.6",
         "@actions/exec": "^1.0.1",
@@ -9534,8 +9533,9 @@
   },
   "dependencies": {
     "@actions/cache": {
-      "version": "file:actions-cache-3.0.1.tgz",
+      "version": "3.0.1",
-      "integrity": "sha512-ucvw0xvFpe0/vfNQ/rc11ste0nidCdBAJ5j5F01BxBqjxmGH2doVzfPlqSIGhcN7wKI074x2ATb9+7HSrTqGHg==",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.0.1.tgz",
+      "integrity": "sha512-z4cbwCuzyZHQ3Y3AyQEFb+WQneC1wcOWfjrKxhulGkbXBLiMH/Uga2hknNEgOY16XaDZ7hArYaY3nUxE7IzqLQ==",
       "requires": {
         "@actions/core": "^1.2.6",
         "@actions/exec": "^1.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cache",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "private": true,
   "description": "Cache dependencies and build outputs",
   "main": "dist/restore/index.js",
@@ -23,7 +23,7 @@
   "author": "GitHub",
   "license": "MIT",
   "dependencies": {
-    "@actions/cache": "file:actions-cache-3.0.1.tgz",
+    "@actions/cache": "^3.0.1",
     "@actions/core": "^1.7.0",
     "@actions/exec": "^1.1.1",
     "@actions/io": "^1.1.2"