Updated actions/cache version to 3.0.2

2025-11-04 13:29:10 +08:00 · 2022-08-09 16:43:43 +00:00
parent f4278025ab
commit a404368986
5 changed files with 36 additions and 14 deletions
--- a/.licenses/npm/@actions/cache.dep.yml
+++ b/.licenses/npm/@actions/cache.dep.yml
@@ -1,6 +1,6 @@
 ---
 name: "@actions/cache"
-version: 3.0.1
+version: 3.0.2
 type: npm
 summary: 
 homepage: 
--- a/dist/restore/index.js
+++ b/dist/restore/index.js
@@ -5473,6 +5473,7 @@ const util = __importStar(__webpack_require__(669));
 const utils = __importStar(__webpack_require__(15));
 const constants_1 = __webpack_require__(931);
 const requestUtils_1 = __webpack_require__(899);
+const abort_controller_1 = __webpack_require__(106);
 /**
 * Pipes the body of a HTTP response to a stream
 *
@@ -5656,11 +5657,16 @@ function downloadCacheStorageSDK(archiveLocation, archivePath, options) {
            const fd = fs.openSync(archivePath, 'w');
            try {
                downloadProgress.startDisplayTimer();
+                const abortSignal = abort_controller_1.AbortController.timeout(options.segmentTimeoutInMs || 3600000);
+                abortSignal.addEventListener('abort', () => {
+                    core.warning('Aborting cache download as it exceeded the timeout.');
+                });
                while (!downloadProgress.isDone()) {
                    const segmentStart = downloadProgress.segmentOffset + downloadProgress.segmentSize;
                    const segmentSize = Math.min(maxSegmentSize, contentLength - segmentStart);
                    downloadProgress.nextSegment(segmentSize);
                    const result = yield client.downloadToBuffer(segmentStart, segmentSize, {
+                        abortSignal,
                        concurrency: options.downloadConcurrency,
                        onProgress: downloadProgress.onProgress()
                    });
@@ -40795,7 +40801,8 @@ function getDownloadOptions(copy) {
    const result = {
        useAzureSdk: true,
        downloadConcurrency: 8,
-        timeoutInMs: 30000
+        timeoutInMs: 30000,
+        segmentTimeoutInMs: 3600000
    };
    if (copy) {
        if (typeof copy.useAzureSdk === 'boolean') {
@@ -40807,10 +40814,14 @@ function getDownloadOptions(copy) {
        if (typeof copy.timeoutInMs === 'number') {
            result.timeoutInMs = copy.timeoutInMs;
        }
+        if (typeof copy.segmentTimeoutInMs === 'number') {
+            result.segmentTimeoutInMs = copy.segmentTimeoutInMs;
+        }
    }
    core.debug(`Use Azure SDK: ${result.useAzureSdk}`);
    core.debug(`Download concurrency: ${result.downloadConcurrency}`);
    core.debug(`Request timeout (ms): ${result.timeoutInMs}`);
+    core.debug(`Segment download timeout (ms): ${result.segmentTimeoutInMs}`);
    return result;
 }
 exports.getDownloadOptions = getDownloadOptions;
--- a/dist/save/index.js
+++ b/dist/save/index.js
@@ -5473,6 +5473,7 @@ const util = __importStar(__webpack_require__(669));
 const utils = __importStar(__webpack_require__(15));
 const constants_1 = __webpack_require__(931);
 const requestUtils_1 = __webpack_require__(899);
+const abort_controller_1 = __webpack_require__(106);
 /**
 * Pipes the body of a HTTP response to a stream
 *
@@ -5656,11 +5657,16 @@ function downloadCacheStorageSDK(archiveLocation, archivePath, options) {
            const fd = fs.openSync(archivePath, 'w');
            try {
                downloadProgress.startDisplayTimer();
+                const abortSignal = abort_controller_1.AbortController.timeout(options.segmentTimeoutInMs || 3600000);
+                abortSignal.addEventListener('abort', () => {
+                    core.warning('Aborting cache download as it exceeded the timeout.');
+                });
                while (!downloadProgress.isDone()) {
                    const segmentStart = downloadProgress.segmentOffset + downloadProgress.segmentSize;
                    const segmentSize = Math.min(maxSegmentSize, contentLength - segmentStart);
                    downloadProgress.nextSegment(segmentSize);
                    const result = yield client.downloadToBuffer(segmentStart, segmentSize, {
+                        abortSignal,
                        concurrency: options.downloadConcurrency,
                        onProgress: downloadProgress.onProgress()
                    });
@@ -40795,7 +40801,8 @@ function getDownloadOptions(copy) {
    const result = {
        useAzureSdk: true,
        downloadConcurrency: 8,
-        timeoutInMs: 30000
+        timeoutInMs: 30000,
+        segmentTimeoutInMs: 3600000
    };
    if (copy) {
        if (typeof copy.useAzureSdk === 'boolean') {
@@ -40807,10 +40814,14 @@ function getDownloadOptions(copy) {
        if (typeof copy.timeoutInMs === 'number') {
            result.timeoutInMs = copy.timeoutInMs;
        }
+        if (typeof copy.segmentTimeoutInMs === 'number') {
+            result.segmentTimeoutInMs = copy.segmentTimeoutInMs;
+        }
    }
    core.debug(`Use Azure SDK: ${result.useAzureSdk}`);
    core.debug(`Download concurrency: ${result.downloadConcurrency}`);
    core.debug(`Request timeout (ms): ${result.timeoutInMs}`);
+    core.debug(`Segment download timeout (ms): ${result.segmentTimeoutInMs}`);
    return result;
 }
 exports.getDownloadOptions = getDownloadOptions;
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,15 @@
 {
  "name": "cache",
-  "version": "3.0.6",
+  "version": "3.0.7",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "cache",
-      "version": "3.0.6",
+      "version": "3.0.7",
      "license": "MIT",
      "dependencies": {
-        "@actions/cache": "^3.0.1",
+        "@actions/cache": "^3.0.2",
        "@actions/core": "^1.7.0",
        "@actions/exec": "^1.1.1",
        "@actions/io": "^1.1.2"
@@ -36,9 +36,9 @@
      }
    },
    "node_modules/@actions/cache": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.0.1.tgz",
-      "integrity": "sha512-z4cbwCuzyZHQ3Y3AyQEFb+WQneC1wcOWfjrKxhulGkbXBLiMH/Uga2hknNEgOY16XaDZ7hArYaY3nUxE7IzqLQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.0.2.tgz",
+      "integrity": "sha512-XGhWOYgMr3ZHxZ07uFis7dHM1/3xgwASPEm4i5Tb6ag6NbvLY86bb3Nik/EKWV2w1jUTdKEpim5EBalo+glzZQ==",
      "dependencies": {
        "@actions/core": "^1.2.6",
        "@actions/exec": "^1.0.1",
@@ -9533,9 +9533,9 @@
  },
  "dependencies": {
    "@actions/cache": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.0.1.tgz",
-      "integrity": "sha512-z4cbwCuzyZHQ3Y3AyQEFb+WQneC1wcOWfjrKxhulGkbXBLiMH/Uga2hknNEgOY16XaDZ7hArYaY3nUxE7IzqLQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.0.2.tgz",
+      "integrity": "sha512-XGhWOYgMr3ZHxZ07uFis7dHM1/3xgwASPEm4i5Tb6ag6NbvLY86bb3Nik/EKWV2w1jUTdKEpim5EBalo+glzZQ==",
      "requires": {
        "@actions/core": "^1.2.6",
        "@actions/exec": "^1.0.1",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cache",
-  "version": "3.0.6",
+  "version": "3.0.7",
  "private": true,
  "description": "Cache dependencies and build outputs",
  "main": "dist/restore/index.js",
@@ -23,7 +23,7 @@
  "author": "GitHub",
  "license": "MIT",
  "dependencies": {
-    "@actions/cache": "^3.0.1",
+    "@actions/cache": "^3.0.2",
    "@actions/core": "^1.7.0",
    "@actions/exec": "^1.1.1",
    "@actions/io": "^1.1.2"