From ef7b22709572db5ac7f1a3ecd34bde7c50affe21 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Wed, 5 Jul 2023 16:42:40 +0200 Subject: [PATCH] use highlevel actions cache api for restore --- dist/index.js | 62 ++---------------------- src/classes/state/state-cache-storage.ts | 19 ++------ 2 files changed, 10 insertions(+), 71 deletions(-) diff --git a/dist/index.js b/dist/index.js index 45f336ce..3f451318 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,51 +1,6 @@ /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 8802: -/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { - -"use strict"; - -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - var desc = Object.getOwnPropertyDescriptor(m, k); - if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { - desc = { enumerable: true, get: function() { return m[k]; } }; - } - Object.defineProperty(o, k2, desc); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || 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); - __setModuleDefault(result, mod); - return result; -}; -var __importDefault = (this && this.__importDefault) || function (mod) { - return (mod && mod.__esModule) ? mod : { "default": mod }; -}; -Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.downloadFileFromActionsCache = void 0; -const cache = __importStar(__nccwpck_require__(7799)); -const path_1 = __importDefault(__nccwpck_require__(1017)); -const downloadFileFromActionsCache = (destFileName, cacheKey, -// eslint-disable-next-line @typescript-eslint/no-unused-vars -cacheVersion) => cache.restoreCache([path_1.default.dirname(destFileName)], cacheKey, [ - cacheKey -]); -exports.downloadFileFromActionsCache = downloadFileFromActionsCache; - - -/***/ }), - /***/ 7236: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -1604,17 +1559,11 @@ const fs_1 = __importDefault(__nccwpck_require__(7147)); const path_1 = __importDefault(__nccwpck_require__(1017)); const os_1 = __importDefault(__nccwpck_require__(2037)); const core = __importStar(__nccwpck_require__(2186)); -const download_1 = __nccwpck_require__(8802); const exec = __importStar(__nccwpck_require__(1514)); const github_1 = __nccwpck_require__(5438); const plugin_retry_1 = __nccwpck_require__(6298); const cache = __importStar(__nccwpck_require__(7799)); -/* -import {uploadFileToActionsCache} from '../actions-cache-internal/upload'; -import {downloadFileFromActionsCache} from '../actions-cache-internal/download'; - */ const CACHE_KEY = '_state'; -const CACHE_VERSION = '1'; const STATE_FILE = 'state.txt'; const STALE_DIR = '56acbeaa-1fef-4c79-8f84-7565e560fb03'; const mkTempDir = () => { @@ -1697,13 +1646,12 @@ class StateCacheStorage { } restore() { return __awaiter(this, void 0, void 0, function* () { - const tmpDir = mkTempDir(); //fs.mkdtempSync('state-'); - const fileName = path_1.default.join(tmpDir, STATE_FILE); - unlinkSafely(fileName); + const tmpDir = mkTempDir(); + const filePath = path_1.default.join(tmpDir, STATE_FILE); + unlinkSafely(filePath); try { - yield (0, download_1.downloadFileFromActionsCache)(fileName, CACHE_KEY, CACHE_VERSION); - yield execCommands([`ls -la ${path_1.default.dirname(fileName)}`]); - if (!fs_1.default.existsSync(fileName)) { + yield cache.restoreCache([path_1.default.dirname(filePath)], CACHE_KEY); + if (!fs_1.default.existsSync(filePath)) { core.info('The stored state has not been found, probably because of the very first run or the previous run failed'); return ''; } diff --git a/src/classes/state/state-cache-storage.ts b/src/classes/state/state-cache-storage.ts index e91918f5..9e085ba0 100644 --- a/src/classes/state/state-cache-storage.ts +++ b/src/classes/state/state-cache-storage.ts @@ -3,19 +3,12 @@ import fs from 'fs'; import path from 'path'; import os from 'os'; import * as core from '@actions/core'; -import {downloadFileFromActionsCache} from '../actions-cache-hilevel/download'; -import {uploadFileToActionsCache} from '../actions-cache-hilevel/upload'; import * as exec from '@actions/exec'; import {getOctokit} from '@actions/github'; import {retry as octokitRetry} from '@octokit/plugin-retry'; import * as cache from '@actions/cache'; -/* -import {uploadFileToActionsCache} from '../actions-cache-internal/upload'; -import {downloadFileFromActionsCache} from '../actions-cache-internal/download'; - */ const CACHE_KEY = '_state'; -const CACHE_VERSION = '1'; const STATE_FILE = 'state.txt'; const STALE_DIR = '56acbeaa-1fef-4c79-8f84-7565e560fb03'; @@ -111,15 +104,13 @@ export class StateCacheStorage implements IStateStorage { } async restore(): Promise { - const tmpDir = mkTempDir(); //fs.mkdtempSync('state-'); - const fileName = path.join(tmpDir, STATE_FILE); - unlinkSafely(fileName); + const tmpDir = mkTempDir(); + const filePath = path.join(tmpDir, STATE_FILE); + unlinkSafely(filePath); try { - await downloadFileFromActionsCache(fileName, CACHE_KEY, CACHE_VERSION); + await cache.restoreCache([path.dirname(filePath)], CACHE_KEY); - await execCommands([`ls -la ${path.dirname(fileName)}`]); - - if (!fs.existsSync(fileName)) { + if (!fs.existsSync(filePath)) { core.info( 'The stored state has not been found, probably because of the very first run or the previous run failed' );