Merge 44d8f60628 into 532b046aaf

dist/cache-save/index.js

@@ -86644,22 +86644,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
         if (mod && mod.__esModule) return mod;
         var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
         __setModuleDefault(result, mod);
         return result;
     };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+})();
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.State = void 0;
 const cache = __importStar(__nccwpck_require__(5116));
@@ -86677,12 +86678,9 @@ class CacheDistributor {
         this.cacheDependencyPath = cacheDependencyPath;
         this.CACHE_KEY_PREFIX = 'setup-python';
     }
-    handleLoadedCache() {
+    async handleLoadedCache() { }
-        return __awaiter(this, void 0, void 0, function* () { });
+    async restoreCache() {
-    }
+        const { primaryKey, restoreKey } = await this.computeKeys();
-    restoreCache() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { primaryKey, restoreKey } = yield this.computeKeys();
         if (primaryKey.endsWith('-')) {
             const file = this.packageManager === 'pip'
                 ? `${this.cacheDependencyPath
@@ -86691,11 +86689,11 @@ class CacheDistributor {
                 : this.cacheDependencyPath.split('\n').join(',');
             throw new Error(`No file in ${process.cwd()} matched to [${file}], make sure you have checked out the target repository`);
         }
-            const cachePath = yield this.getCacheGlobalDirectories();
+        const cachePath = await this.getCacheGlobalDirectories();
         core.saveState(State.CACHE_PATHS, cachePath);
         let matchedKey;
         try {
-                matchedKey = yield cache.restoreCache(cachePath, primaryKey, restoreKey);
+            matchedKey = await cache.restoreCache(cachePath, primaryKey, restoreKey);
         }
         catch (err) {
             const message = err.message;
@@ -86704,9 +86702,8 @@ class CacheDistributor {
             return;
         }
         core.saveState(State.STATE_CACHE_PRIMARY_KEY, primaryKey);
-            yield this.handleLoadedCache();
+        await this.handleLoadedCache();
         this.handleMatchResult(matchedKey, primaryKey);
-        });
     }
     handleMatchResult(matchedKey, primaryKey) {
         if (matchedKey) {
@@ -86757,27 +86754,28 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
         if (mod && mod.__esModule) return mod;
         var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
         __setModuleDefault(result, mod);
         return result;
     };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+})();
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.run = void 0;
+exports.run = run;
 const core = __importStar(__nccwpck_require__(7484));
 const cache = __importStar(__nccwpck_require__(5116));
 const fs_1 = __importDefault(__nccwpck_require__(9896));
@@ -86785,12 +86783,11 @@ const cache_distributor_1 = __nccwpck_require__(2326);
 // Added early exit to resolve issue with slow post action step:
 // - https://github.com/actions/setup-node/issues/878
 // https://github.com/actions/cache/pull/1217
-function run(earlyExit) {
+async function run(earlyExit) {
-    return __awaiter(this, void 0, void 0, function* () {
     try {
         const cache = core.getInput('cache');
         if (cache) {
-                yield saveCache(cache);
+            await saveCache(cache);
             if (earlyExit) {
                 process.exit(0);
             }
@@ -86800,11 +86797,8 @@ function run(earlyExit) {
         const err = error;
         core.setFailed(err.message);
     }
-    });
 }
-exports.run = run;
+async function saveCache(packageManager) {
-function saveCache(packageManager) {
-    return __awaiter(this, void 0, void 0, function* () {
     const cachePathState = core.getState(cache_distributor_1.State.CACHE_PATHS);
     if (!cachePathState) {
         core.warning('Cache paths are empty. Please check the previous logs and make sure that the python version is specified');
@@ -86828,7 +86822,7 @@ function saveCache(packageManager) {
     }
     let cacheId = 0;
     try {
-            cacheId = yield cache.saveCache(cachePaths, primaryKey);
+        cacheId = await cache.saveCache(cachePaths, primaryKey);
     }
     catch (err) {
         const message = err.message;
@@ -86839,7 +86833,6 @@ function saveCache(packageManager) {
         return;
     }
     core.info(`Cache saved with the key: ${primaryKey}`);
-    });
 }
 function isCacheDirectoryExists(cacheDirectory) {
     const result = cacheDirectory.reduce((previousValue, currentValue) => {

package-lock.json

@@ -34,7 +34,7 @@
         "jest-circus": "^29.7.0",
         "prettier": "^3.5.3",
         "ts-jest": "^29.3.2",
-        "typescript": "^5.4.2"
+        "typescript": "^5.8.3"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -5255,10 +5255,11 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.2",
+      "version": "5.8.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-      "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==",
+      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"

package.json

@@ -50,6 +50,6 @@
     "jest-circus": "^29.7.0",
     "prettier": "^3.5.3",
     "ts-jest": "^29.3.2",
-    "typescript": "^5.4.2"
+    "typescript": "^5.8.3"
   }
 }

tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
-    "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "target": "es2021",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
     "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */