From 82d40c283aeb1f2b6595839195e95c2d6a49081b Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Thu, 25 Apr 2024 03:26:57 +0200 Subject: [PATCH] feat: remove Go cache management (#1024) --- README.md | 8 +------- action.yml | 8 -------- dist/post_run/index.js | 23 ++--------------------- dist/run/index.js | 23 ++--------------------- src/cache.ts | 24 ++---------------------- 5 files changed, 7 insertions(+), 79 deletions(-) diff --git a/README.md b/README.md index 70d2ff2d91..0dd993cac4 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ jobs: # Require: The version of golangci-lint to use. # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version. # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit. - version: v1.54 + version: v1.57 # Optional: working directory, useful for monorepos # working-directory: somedir @@ -71,12 +71,6 @@ jobs: # subject to other options # skip-save-cache: true - # Optional: if set to true, then the action won't cache or restore ~/go/pkg. - # skip-pkg-cache: true - - # Optional: if set to true, then the action won't cache or restore ~/.cache/go-build. - # skip-build-cache: true - # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'. # install-mode: "goinstall" ``` diff --git a/action.yml b/action.yml index 7ab3103190..4f3cb3a4bf 100644 --- a/action.yml +++ b/action.yml @@ -35,14 +35,6 @@ inputs: restore existing caches, subject to other options. default: 'false' required: false - skip-pkg-cache: - description: "if set to true then the action doesn't cache or restore ~/go/pkg." - default: 'false' - required: false - skip-build-cache: - description: "if set to true then the action doesn't cache or restore ~/.cache/go-build." - default: 'false' - required: false install-mode: description: "The mode to install golangci-lint. It can be 'binary' or 'goinstall'." default: "binary" diff --git a/dist/post_run/index.js b/dist/post_run/index.js index 89c0c1fbbd..ff6cea0d20 100644 --- a/dist/post_run/index.js +++ b/dist/post_run/index.js @@ -88813,25 +88813,6 @@ const pathExists = async (path) => !!(await fs.promises.stat(path).catch(() => f const getLintCacheDir = () => { return path_1.default.resolve(`${process.env.HOME}/.cache/golangci-lint`); }; -const getCacheDirs = () => { - // Not existing dirs are ok here: it works. - const skipPkgCache = core.getInput(`skip-pkg-cache`, { required: true }).trim(); - const skipBuildCache = core.getInput(`skip-build-cache`, { required: true }).trim(); - const dirs = [getLintCacheDir()]; - if (skipBuildCache.toLowerCase() == "true") { - core.info(`Omitting ~/.cache/go-build from cache directories`); - } - else { - dirs.push(path_1.default.resolve(`${process.env.HOME}/.cache/go-build`)); - } - if (skipPkgCache.toLowerCase() == "true") { - core.info(`Omitting ~/go/pkg from cache directories`); - } - else { - dirs.push(path_1.default.resolve(`${process.env.HOME}/go/pkg`)); - } - return dirs; -}; const getIntervalKey = (invalidationIntervalDays) => { const now = new Date(); const secondsSinceEpoch = now.getTime() / 1000; @@ -88878,7 +88859,7 @@ async function restoreCache() { } core.saveState(constants_1.State.CachePrimaryKey, primaryKey); try { - const cacheKey = await cache.restoreCache(getCacheDirs(), primaryKey, restoreKeys); + const cacheKey = await cache.restoreCache([getLintCacheDir()], primaryKey, restoreKeys); if (!cacheKey) { core.info(`Cache not found for input keys: ${[primaryKey, ...restoreKeys].join(", ")}`); return; @@ -88908,7 +88889,7 @@ async function saveCache() { return; } const startedAt = Date.now(); - const cacheDirs = getCacheDirs(); + const cacheDirs = [getLintCacheDir()]; const primaryKey = core.getState(constants_1.State.CachePrimaryKey); if (!primaryKey) { utils.logWarning(`Error retrieving key from state.`); diff --git a/dist/run/index.js b/dist/run/index.js index d4c8ce078d..1965346a67 100644 --- a/dist/run/index.js +++ b/dist/run/index.js @@ -88813,25 +88813,6 @@ const pathExists = async (path) => !!(await fs.promises.stat(path).catch(() => f const getLintCacheDir = () => { return path_1.default.resolve(`${process.env.HOME}/.cache/golangci-lint`); }; -const getCacheDirs = () => { - // Not existing dirs are ok here: it works. - const skipPkgCache = core.getInput(`skip-pkg-cache`, { required: true }).trim(); - const skipBuildCache = core.getInput(`skip-build-cache`, { required: true }).trim(); - const dirs = [getLintCacheDir()]; - if (skipBuildCache.toLowerCase() == "true") { - core.info(`Omitting ~/.cache/go-build from cache directories`); - } - else { - dirs.push(path_1.default.resolve(`${process.env.HOME}/.cache/go-build`)); - } - if (skipPkgCache.toLowerCase() == "true") { - core.info(`Omitting ~/go/pkg from cache directories`); - } - else { - dirs.push(path_1.default.resolve(`${process.env.HOME}/go/pkg`)); - } - return dirs; -}; const getIntervalKey = (invalidationIntervalDays) => { const now = new Date(); const secondsSinceEpoch = now.getTime() / 1000; @@ -88878,7 +88859,7 @@ async function restoreCache() { } core.saveState(constants_1.State.CachePrimaryKey, primaryKey); try { - const cacheKey = await cache.restoreCache(getCacheDirs(), primaryKey, restoreKeys); + const cacheKey = await cache.restoreCache([getLintCacheDir()], primaryKey, restoreKeys); if (!cacheKey) { core.info(`Cache not found for input keys: ${[primaryKey, ...restoreKeys].join(", ")}`); return; @@ -88908,7 +88889,7 @@ async function saveCache() { return; } const startedAt = Date.now(); - const cacheDirs = getCacheDirs(); + const cacheDirs = [getLintCacheDir()]; const primaryKey = core.getState(constants_1.State.CachePrimaryKey); if (!primaryKey) { utils.logWarning(`Error retrieving key from state.`); diff --git a/src/cache.ts b/src/cache.ts index ed1da7517a..5c73169753 100644 --- a/src/cache.ts +++ b/src/cache.ts @@ -23,26 +23,6 @@ const getLintCacheDir = (): string => { return path.resolve(`${process.env.HOME}/.cache/golangci-lint`) } -const getCacheDirs = (): string[] => { - // Not existing dirs are ok here: it works. - const skipPkgCache = core.getInput(`skip-pkg-cache`, { required: true }).trim() - const skipBuildCache = core.getInput(`skip-build-cache`, { required: true }).trim() - const dirs = [getLintCacheDir()] - - if (skipBuildCache.toLowerCase() == "true") { - core.info(`Omitting ~/.cache/go-build from cache directories`) - } else { - dirs.push(path.resolve(`${process.env.HOME}/.cache/go-build`)) - } - if (skipPkgCache.toLowerCase() == "true") { - core.info(`Omitting ~/go/pkg from cache directories`) - } else { - dirs.push(path.resolve(`${process.env.HOME}/go/pkg`)) - } - - return dirs -} - const getIntervalKey = (invalidationIntervalDays: number): string => { const now = new Date() const secondsSinceEpoch = now.getTime() / 1000 @@ -97,7 +77,7 @@ export async function restoreCache(): Promise { } core.saveState(State.CachePrimaryKey, primaryKey) try { - const cacheKey = await cache.restoreCache(getCacheDirs(), primaryKey, restoreKeys) + const cacheKey = await cache.restoreCache([getLintCacheDir()], primaryKey, restoreKeys) if (!cacheKey) { core.info(`Cache not found for input keys: ${[primaryKey, ...restoreKeys].join(", ")}`) return @@ -128,7 +108,7 @@ export async function saveCache(): Promise { const startedAt = Date.now() - const cacheDirs = getCacheDirs() + const cacheDirs = [getLintCacheDir()] const primaryKey = core.getState(State.CachePrimaryKey) if (!primaryKey) { utils.logWarning(`Error retrieving key from state.`)