From b2bd9b3248ded6c84c78e08fc398eef5812cb437 Mon Sep 17 00:00:00 2001 From: Yohe-Am <56622350+Yohe-Am@users.noreply.github.com> Date: Mon, 6 May 2024 20:11:11 +0000 Subject: [PATCH] fix: bug with transition to cook --- .ghjk/lock.json | 87 ++++++++++++------------ .github/workflows/ci.yml | 5 +- ghjk.ts | 6 +- index.js | 142 ++++++++++++++++++++------------------- index.ts | 4 +- 5 files changed, 124 insertions(+), 120 deletions(-) diff --git a/.ghjk/lock.json b/.ghjk/lock.json index 4a4c9fa..69e95fd 100644 --- a/.ghjk/lock.json +++ b/.ghjk/lock.json @@ -5,7 +5,7 @@ "ports": { "version": "0", "configResolutions": { - "44d223069c56998553dc10b809e0f33aede650ff1cedef1a82ee023b55414d86": { + "bciqejurda2ofngmfkpobboaj4dztv3pgkd7rz3ppdkbo4ar3kvau3bq": { "version": "v20.6.0", "buildDepConfigs": { "tar_aa": { @@ -16,18 +16,18 @@ }, "portRef": "node_org@0.1.0" }, - "9e3fa7742c431c34ae7ba8d1e907e50c937ccfb631fb4dcfb7a1773742abe267": { + "bciqj4p5hoqweghbuvz52rupja7sqze34z63dd62nz632c5zxikv6ezy": { "version": "1.34", "buildDepConfigs": {}, "portRef": "tar_aa@0.1.0" }, - "b0ce2f6c1f9623b95308a6f91baf13dd2a53379ac5d2448d5983e0fa2eda8849": { - "version": "v9.0.6", + "bciqlbtrpnqpzmi5zkmekn6i3v4j52kstg6nmluservmyhyh2f3niqsi": { + "version": "v9.1.0", "buildDepConfigs": {}, "portRef": "pnpm_ghrel@0.1.0" }, - "95dbc2b8c604a5996b88c5b1b4fb0c10b3e0d9cac68f57eb915b012c44288e93": { - "version": "v0.2.61", + "bciqjlw6cxddajjmznoemlmnu7mgbbm7a3hfmnd2x5oivwajmiqui5ey": { + "version": "v0.2.62", "buildDepConfigs": {}, "portRef": "act_ghrel@0.1.0" } @@ -48,11 +48,11 @@ "sets": { "ghjkEnvProvInstSet___main": { "installs": [ - "93e8abaafd1daa8884d12b83495005cd005cc40e", - "7971f447dd550b36b10f3b918ff24a22488bbf7c", - "6efa3da821eb291284bee3a1dc55fd633b89b5d6" + "bciqd2zqmf5yiorxnjw6wmm45oywzeh76cdq2kt3wm3i4wceu3pmeyya", + "bciqprh64fdx3dpqksmczvqdnlpzldiw337ve7x2aozqhwe6pqlpey3q", + "bciqkmdsvfma4gqsqfchr44f6kx4yqjszbhsfcbcin4fkwpmepplcu2y" ], - "allowedDeps": "1a37a2812838bbd5e5c1e9abde0228f1e40765b9" + "allowedDeps": "bciqbdwn63lri7vabf6ajy2dzgjlqtdq3zpr2beps7jfdg6s6dps7d5i" } } } @@ -61,7 +61,8 @@ "id": "tasks", "config": { "envs": {}, - "tasks": {} + "tasks": {}, + "tasksNamed": [] } }, { @@ -83,7 +84,7 @@ } ], "blackboard": { - "93e8abaafd1daa8884d12b83495005cd005cc40e": { + "bciqd2zqmf5yiorxnjw6wmm45oywzeh76cdq2kt3wm3i4wceu3pmeyya": { "version": "20.6.0", "port": { "ty": "denoWorker@v1", @@ -102,10 +103,10 @@ "name": "tar_aa" } ], - "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/6a00967/ports/node.ts" + "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/a6dcf8d/ports/node.ts" } }, - "7971f447dd550b36b10f3b918ff24a22488bbf7c": { + "bciqprh64fdx3dpqksmczvqdnlpzldiw337ve7x2aozqhwe6pqlpey3q": { "port": { "ty": "denoWorker@v1", "name": "pnpm_ghrel", @@ -118,10 +119,10 @@ "x86_64-windows" ], "version": "0.1.0", - "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/6a00967/ports/pnpm.ts" + "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/a6dcf8d/ports/pnpm.ts" } }, - "6efa3da821eb291284bee3a1dc55fd633b89b5d6": { + "bciqkmdsvfma4gqsqfchr44f6kx4yqjszbhsfcbcin4fkwpmepplcu2y": { "port": { "ty": "denoWorker@v1", "name": "act_ghrel", @@ -134,10 +135,10 @@ "x86_64-windows" ], "version": "0.1.0", - "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/6a00967/ports/act.ts" + "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/a6dcf8d/ports/act.ts" } }, - "e0d1f160d2d7755765f6f01a27a0c33a02ff98d2": { + "bciqb6ua63xodzwxngnbjq35hfikiwzb3dclbqkc7e6xgjdt5jin4pia": { "manifest": { "ty": "ambientAccess@v1", "name": "tar_aa", @@ -157,7 +158,7 @@ "portRef": "tar_aa@0.1.0" } }, - "9d26d0d90f6ecdd69d0705a042b01a344aa626ee": { + "bciqfl5s36w335ducrb6f6gwb3vuwup7vzqwwg67pq42xtkngsnxqobi": { "manifest": { "ty": "ambientAccess@v1", "name": "git_aa", @@ -191,7 +192,7 @@ "portRef": "git_aa@0.1.0" } }, - "3c447f912abf18883bd05314f946740975ee0dd3": { + "bciqcfe7qyxmokpn6pgtaj35r5qg74jkehuu6cvyrtcsnegvwlm64oqy": { "manifest": { "ty": "ambientAccess@v1", "name": "curl_aa", @@ -225,7 +226,7 @@ "portRef": "curl_aa@0.1.0" } }, - "dfb0f5e74666817e6ab8cbceca0c9da271142bca": { + "bciqgkpwxjmo5phw5se4ugyiz4xua3xrd54quzmk7wdwpq3vghglogjy": { "manifest": { "ty": "ambientAccess@v1", "name": "unzip_aa", @@ -247,7 +248,7 @@ "portRef": "unzip_aa@0.1.0" } }, - "d9122eff1fe3ef56872e53dae725ff3ccb37472e": { + "bciqmcvyepuficjj3mwshsbfecwdmzch5gwxqo557icnq4zujtdllh4a": { "manifest": { "ty": "ambientAccess@v1", "name": "zstd_aa", @@ -267,7 +268,7 @@ "portRef": "zstd_aa@0.1.0" } }, - "a73ee02b6ceed6090f8e2df65d93e3306d0f20ce": { + "bciqbus5uksj5zosna6glmp7hnrumqrb4gu7p2nqardqhw43fdlykapi": { "manifest": { "ty": "denoWorker@v1", "name": "rustup_rustlang", @@ -292,13 +293,13 @@ "name": "git_aa" } ], - "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/6a00967/ports/rustup.ts" + "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/a6dcf8d/ports/rustup.ts" }, "defaultInst": { "portRef": "rustup_rustlang@0.1.0" } }, - "aed555cd28f905f4a1af54a62ad14ca8b57cb86d": { + "bciqg3umt6ba66ft4vkdchvx2ffxlktfo7mq34wxge7iyvlwdazfjkgy": { "manifest": { "ty": "denoWorker@v1", "name": "rust_rustup", @@ -328,13 +329,13 @@ "name": "rustup_rustlang" } ], - "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/6a00967/ports/rust.ts" + "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/a6dcf8d/ports/rust.ts" }, "defaultInst": { "portRef": "rust_rustup@0.1.0" } }, - "9150f44155f76e124a3a26415b6f5e301d0155b8": { + "bciqcjdmvoiszcmj5ttpbs75f4vebkqu6rbzjsuyyz4ltq7xahygxzgi": { "manifest": { "ty": "denoWorker@v1", "name": "cargo_binstall_ghrel", @@ -345,13 +346,13 @@ "x86_64-darwin" ], "version": "0.1.0", - "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/6a00967/ports/cargo-binstall.ts" + "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/a6dcf8d/ports/cargo-binstall.ts" }, "defaultInst": { "portRef": "cargo_binstall_ghrel@0.1.0" } }, - "851368a7fb65017076e11b207c01c21d13363e3f": { + "bciqikx65ohapefnex6k2ncw4f722yrxh2o2yswieihkd22metx5r75q": { "manifest": { "ty": "denoWorker@v1", "name": "pnpm_ghrel", @@ -364,13 +365,13 @@ "x86_64-windows" ], "version": "0.1.0", - "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/6a00967/ports/pnpm.ts" + "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/a6dcf8d/ports/pnpm.ts" }, "defaultInst": { "portRef": "pnpm_ghrel@0.1.0" } }, - "ed1301e5b6339feaa5dcecc65789355003399e41": { + "bciqfijmmeplxwqjjcpdf4wwj6hud4qe6ml3hfnpoyw2jb44msw5rzga": { "manifest": { "ty": "denoWorker@v1", "name": "asdf_plugin_git", @@ -393,23 +394,23 @@ "name": "git_aa" } ], - "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/6a00967/ports/asdf_plugin_git.ts" + "moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/a6dcf8d/ports/asdf_plugin_git.ts" }, "defaultInst": { "portRef": "asdf_plugin_git@0.1.0" } }, - "1a37a2812838bbd5e5c1e9abde0228f1e40765b9": { - "tar_aa": "e0d1f160d2d7755765f6f01a27a0c33a02ff98d2", - "git_aa": "9d26d0d90f6ecdd69d0705a042b01a344aa626ee", - "curl_aa": "3c447f912abf18883bd05314f946740975ee0dd3", - "unzip_aa": "dfb0f5e74666817e6ab8cbceca0c9da271142bca", - "zstd_aa": "d9122eff1fe3ef56872e53dae725ff3ccb37472e", - "rustup_rustlang": "a73ee02b6ceed6090f8e2df65d93e3306d0f20ce", - "rust_rustup": "aed555cd28f905f4a1af54a62ad14ca8b57cb86d", - "cargo_binstall_ghrel": "9150f44155f76e124a3a26415b6f5e301d0155b8", - "pnpm_ghrel": "851368a7fb65017076e11b207c01c21d13363e3f", - "asdf_plugin_git": "ed1301e5b6339feaa5dcecc65789355003399e41" + "bciqbdwn63lri7vabf6ajy2dzgjlqtdq3zpr2beps7jfdg6s6dps7d5i": { + "tar_aa": "bciqb6ua63xodzwxngnbjq35hfikiwzb3dclbqkc7e6xgjdt5jin4pia", + "git_aa": "bciqfl5s36w335ducrb6f6gwb3vuwup7vzqwwg67pq42xtkngsnxqobi", + "curl_aa": "bciqcfe7qyxmokpn6pgtaj35r5qg74jkehuu6cvyrtcsnegvwlm64oqy", + "unzip_aa": "bciqgkpwxjmo5phw5se4ugyiz4xua3xrd54quzmk7wdwpq3vghglogjy", + "zstd_aa": "bciqmcvyepuficjj3mwshsbfecwdmzch5gwxqo557icnq4zujtdllh4a", + "rustup_rustlang": "bciqbus5uksj5zosna6glmp7hnrumqrb4gu7p2nqardqhw43fdlykapi", + "rust_rustup": "bciqg3umt6ba66ft4vkdchvx2ffxlktfo7mq34wxge7iyvlwdazfjkgy", + "cargo_binstall_ghrel": "bciqcjdmvoiszcmj5ttpbs75f4vebkqu6rbzjsuyyz4ltq7xahygxzgi", + "pnpm_ghrel": "bciqikx65ohapefnex6k2ncw4f722yrxh2o2yswieihkd22metx5r75q", + "asdf_plugin_git": "bciqfijmmeplxwqjjcpdf4wwj6hud4qe6ml3hfnpoyw2jb44msw5rzga" } } } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 893cbef..85875aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: Continuous Integration env: - GHJK_VERSION: 6a00967 + GHJK_VERSION: 61d9c10 on: pull_request: @@ -28,4 +28,5 @@ jobs: - name: Check avail of pnpm shell: bash - run: pnpm --version + run: + pnpm --version diff --git a/ghjk.ts b/ghjk.ts index a296e2a..3150a99 100644 --- a/ghjk.ts +++ b/ghjk.ts @@ -1,9 +1,9 @@ -export { ghjk } from "https://raw.github.com/metatypedev/ghjk/6a00967/mod.ts"; +export { ghjk } from "https://raw.github.com/metatypedev/ghjk/61d9c10/mod.ts"; import { $, install, -} from "https://raw.github.com/metatypedev/ghjk/6a00967/mod.ts"; -import * as ports from "https://raw.github.com/metatypedev/ghjk/6a00967/ports/mod.ts"; +} from "https://raw.github.com/metatypedev/ghjk/61d9c10/mod.ts"; +import * as ports from "https://raw.github.com/metatypedev/ghjk/61d9c10/ports/mod.ts"; install( ports.node({ diff --git a/index.js b/index.js index 0033a81..8a2d115 100644 --- a/index.js +++ b/index.js @@ -81702,7 +81702,7 @@ const fs = __importStar(__nccwpck_require__(3292)); const node_fetch_1 = __importDefault(__nccwpck_require__(467)); const crypto_1 = __importDefault(__nccwpck_require__(6113)); // TODO: auto-manage these versions -const DENO_VERSION = '1.42.4'; +const DENO_VERSION = "1.42.4"; async function latestGhjkVersion() { const resp = await (0, node_fetch_1.default)(`https://api.github.com/repos/metatypedev/ghjk/releases/latest`); if (!resp.ok) { @@ -81717,48 +81717,48 @@ async function latestGhjkVersion() { */ async function main() { try { - const inputVersion = core.getInput('version'); - const inputInstallerUrl = core.getInput('installer-url'); - const inputSync = core.getInput('sync'); - const inputSkipDenoInstall = core.getInput('skip-deno-install'); - const inputCacheDisable = core.getInput('cache-disable'); - const inputCacheKeyPrefix = core.getInput('cache-key-prefix'); - const inputCacheSaveIf = core.getInput('cache-save-if'); - const inputCacheKeyEnvVars = core.getInput('cache-key-env-vars'); - process.env.GHJK_LOG = 'debug'; - const denoCache = path.resolve(os.homedir(), '.cache', 'deno'); + const inputVersion = core.getInput("version"); + const inputInstallerUrl = core.getInput("installer-url"); + const inputCook = core.getInput("cook"); + const inputSkipDenoInstall = core.getInput("skip-deno-install"); + const inputCacheDisable = core.getInput("cache-disable"); + const inputCacheKeyPrefix = core.getInput("cache-key-prefix"); + const inputCacheSaveIf = core.getInput("cache-save-if"); + const inputCacheKeyEnvVars = core.getInput("cache-key-env-vars"); + process.env.GHJK_LOG = "debug"; + const denoCache = path.resolve(os.homedir(), ".cache", "deno"); process.env.DENO_DIR = denoCache; process.env.GHJK_INSTALL_DENO_DIR = denoCache; const version = inputVersion.length > 0 ? inputVersion - : process.env['GHJK_VERSION'] ?? (await latestGhjkVersion()); + : process.env["GHJK_VERSION"] ?? (await latestGhjkVersion()); const installerUrl = inputInstallerUrl.length > 0 ? inputInstallerUrl : `https://raw.github.com/metatypedev/ghjk/${version}/install.ts`; - const execDir = await installGhjk(version, installerUrl, inputSkipDenoInstall === 'true'); + const execDir = await installGhjk(version, installerUrl, inputSkipDenoInstall === "true"); core.addPath(execDir); - const configStr = (await exec.getExecOutput('ghjk', ['print', 'config'])) + const configStr = (await exec.getExecOutput("ghjk", ["print", "config"])) .stdout; - const shareDir = (await exec.getExecOutput('ghjk', ['print', 'share-dir-path'], { - silent: true + const shareDir = (await exec.getExecOutput("ghjk", ["print", "share-dir-path"], { + silent: true, })).stdout.trim(); - if (inputCacheDisable === 'false' && cache.isFeatureAvailable()) { - const ghjkVersion = (await exec.getExecOutput('ghjk', ['--version'], { silent: true })).stdout.trim(); - const configPath = (await exec.getExecOutput('ghjk', ['print', 'ghjkfile-path'], { - silent: true + if (inputCacheDisable === "false" && cache.isFeatureAvailable()) { + const ghjkVersion = (await exec.getExecOutput("ghjk", ["--version"], { silent: true })).stdout.trim(); + const configPath = (await exec.getExecOutput("ghjk", ["print", "ghjkfile-path"], { + silent: true, })).stdout.trim(); - const ghjkDirPath = (await exec.getExecOutput('ghjk', ['print', 'ghjkfile-path'], { - silent: true + const ghjkDirPath = (await exec.getExecOutput("ghjk", ["print", "ghjkfile-path"], { + silent: true, })).stdout.trim(); - const lockfilePath = path.resolve(ghjkDirPath, 'lock.json'); + const lockfilePath = path.resolve(ghjkDirPath, "lock.json"); let lockJson = undefined; try { - lockJson = await fs.readFile(lockfilePath, { encoding: 'utf8' }); + lockJson = await fs.readFile(lockfilePath, { encoding: "utf8" }); } catch (_err) { /* FILE was not found*/ } - const hasher = crypto_1.default.createHash('sha1'); + const hasher = crypto_1.default.createHash("sha1"); hasher.update(ghjkVersion); hasher.update(configPath); // TODO: consider ignoring config to avoid misses just for one dep change @@ -81767,41 +81767,43 @@ async function main() { hasher.update(lockJson); } const hashedEnvs = [ - 'GHJK', - 'DENO', + "GHJK", + "DENO", ...inputCacheKeyEnvVars - .split(',') - .filter(str => str.length > 0) - .map(str => str.trim()) + .split(",") + .filter((str) => str.length > 0) + .map((str) => str.trim()), ]; for (const [key, val] of Object.entries(process.env)) { - if (hashedEnvs.some(pfix => key.startsWith(pfix))) { + if (hashedEnvs.some((pfix) => key.startsWith(pfix))) { hasher.update(`${key}=${val}`); } } - const hash = hasher.digest('hex'); - const keyPrefix = inputCacheKeyPrefix.length > 0 ? inputCacheKeyPrefix : 'v0-ghjk'; + const hash = hasher.digest("hex"); + const keyPrefix = inputCacheKeyPrefix.length > 0 + ? inputCacheKeyPrefix + : "v0-ghjk"; const key = `${keyPrefix}-${hash}`; - const portsDir = core.toPlatformPath(path.resolve(shareDir, 'ports')); + const portsDir = core.toPlatformPath(path.resolve(shareDir, "ports")); const cacheDirs = [portsDir, denoCache]; core.info(JSON.stringify({ cacheDirs, portsDir })); // NOTE: restoreCache modifies the array it's given for some reason await cache.restoreCache([...cacheDirs], key); - if (inputCacheSaveIf === 'true') { + if (inputCacheSaveIf === "true") { core.info(`enabling cache with key ${key}: [${cacheDirs}]`); - core.saveState('ghjk-cache-save', true); - core.saveState('ghjk-post-args', { + core.saveState("ghjk-cache-save", true); + core.saveState("ghjk-post-args", { key, - cacheDirs + cacheDirs, }); } } - if (inputSync === 'true') { - await exec.exec('ghjk', ['envs', 'cook']); + if (inputCook === "true") { + await exec.exec("ghjk", ["envs", "cook"]); } - core.exportVariable('BASH_ENV', `${shareDir}/env.bash`); - core.exportVariable('GHJK_SHARE_DIR', shareDir); - core.exportVariable('GHJK_DENO_DIR', denoCache); + core.exportVariable("BASH_ENV", `${shareDir}/env.bash`); + core.exportVariable("GHJK_SHARE_DIR", shareDir); + core.exportVariable("GHJK_DENO_DIR", denoCache); } catch (error) { // Fail the workflow run if an error occurs @@ -81811,18 +81813,18 @@ async function main() { } exports.main = main; async function installGhjk(version, installerUrl, skipDenoInstall) { - let denoExec = 'deno'; - if (skipDenoInstall && !process.env['GHJK_INSTALL_DENO_EXEC']) { - const denoOut = await exec.getExecOutput('deno', ['--version']); + let denoExec = "deno"; + if (skipDenoInstall && !process.env["GHJK_INSTALL_DENO_EXEC"]) { + const denoOut = await exec.getExecOutput("deno", ["--version"]); if (denoOut.exitCode !== 0) { - throw new Error('skip-deno-install set but no deno binary found'); + throw new Error("skip-deno-install set but no deno binary found"); } core.debug(`skipping deno install & using found "deno" bin`); } else { - denoExec = await installDeno(process.env['DENO_VERSION'] ?? DENO_VERSION); + denoExec = await installDeno(process.env["DENO_VERSION"] ?? DENO_VERSION); } - const foundExecDir = tc.find('ghjk', version); + const foundExecDir = tc.find("ghjk", version); if (foundExecDir.length !== 0) { core.debug(`found cached ghjk tool under version ${version}: ${foundExecDir}`); return foundExecDir; @@ -81831,20 +81833,20 @@ async function installGhjk(version, installerUrl, skipDenoInstall) { core.debug(`unable to find cached ghjk tool under version ${version}`); } core.debug(`installing ghjk using install.ts`); - const installDir = process.env['GHJK_INSTALL_EXE_DIR'] ?? - core.toPlatformPath(path.resolve(os.homedir(), '.local', 'bin')); + const installDir = process.env["GHJK_INSTALL_EXE_DIR"] ?? + core.toPlatformPath(path.resolve(os.homedir(), ".local", "bin")); const env = { ...process.env, GHJK_INSTALL_EXE_DIR: installDir, - SHELL: 'bash' + SHELL: "bash", }; // NOTE: we make the ghjk bin use whichver deno is avail in path // to avoid it hardcoding the current deno bin path // which won't be the same after tool cache restore - env['GHJK_INSTALL_DENO_EXEC'] = 'deno'; - core.debug(JSON.stringify({ denoExec, env }, undefined, ' ')); + env["GHJK_INSTALL_DENO_EXEC"] = "deno"; + core.debug(JSON.stringify({ denoExec, env }, undefined, " ")); await exec.exec(`"${denoExec}" run -A`, [installerUrl], { env }); - return await tc.cacheDir(installDir, 'ghjk', version); + return await tc.cacheDir(installDir, "ghjk", version); } exports.installGhjk = installGhjk; async function installDeno(version) { @@ -81855,32 +81857,32 @@ async function installDeno(version) { function zipName() { let arch; switch (process.arch) { - case 'arm64': - arch = 'aarch64'; + case "arm64": + arch = "aarch64"; break; - case 'x64': - arch = 'x86_64'; + case "x64": + arch = "x86_64"; break; default: throw new Error(`Unsupported architechture ${process.arch}.`); } let platform; switch (process.platform) { - case 'linux': - platform = 'unknown-linux-gnu'; + case "linux": + platform = "unknown-linux-gnu"; break; - case 'darwin': - platform = 'apple-darwin'; + case "darwin": + platform = "apple-darwin"; break; - case 'win32': - platform = 'pc-windows-msvc'; + case "win32": + platform = "pc-windows-msvc"; break; default: throw new Error(`Unsupported platform ${process.platform}.`); } return `deno-${arch}-${platform}.zip`; } - const cachedPath = tc.find('ghjk-deno', version); + const cachedPath = tc.find("ghjk-deno", version); if (cachedPath) { core.info(`Using cached Deno installation from ${cachedPath}.`); core.addPath(cachedPath); @@ -81891,7 +81893,7 @@ async function installDeno(version) { core.info(`Downloading Deno from ${url}.`); const zipPath = await tc.downloadTool(url); const extractedFolder = await tc.extractZip(zipPath); - const newCachedPath = await tc.cacheDir(extractedFolder, 'ghjk-deno', version); + const newCachedPath = await tc.cacheDir(extractedFolder, "ghjk-deno", version); core.info(`Cached Deno to ${newCachedPath}.`); core.addPath(newCachedPath); return `${newCachedPath}/deno`; @@ -81904,15 +81906,15 @@ exports.installDeno = installDeno; async function post() { try { if (cache.isFeatureAvailable() && - core.getState('ghjk-cache-save') === 'true') { - const argsStr = core.getState('ghjk-post-args'); + core.getState("ghjk-cache-save") === "true") { + const argsStr = core.getState("ghjk-post-args"); core.info(argsStr); const args = JSON.parse(argsStr); const { key, cacheDirs } = args; await cache.saveCache(cacheDirs, key); } else { - core.info('cache-save flag is false, skipping'); + core.info("cache-save flag is false, skipping"); } } catch (error) { diff --git a/index.ts b/index.ts index 4d75cc9..1909c07 100644 --- a/index.ts +++ b/index.ts @@ -33,7 +33,7 @@ export async function main(): Promise { try { const inputVersion = core.getInput('version') const inputInstallerUrl = core.getInput('installer-url') - const inputSync = core.getInput('sync') + const inputCook = core.getInput('cook') const inputSkipDenoInstall = core.getInput('skip-deno-install') const inputCacheDisable = core.getInput('cache-disable') const inputCacheKeyPrefix = core.getInput('cache-key-prefix') @@ -139,7 +139,7 @@ export async function main(): Promise { } } - if (inputSync === 'true') { + if (inputCook === 'true') { await exec.exec('ghjk', ['envs', 'cook']) }