Replace forked cache by official npm

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
   build: # make sure build/ci work properly
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - run: |
         npm install
         npm run prepare-deps
@@ -18,7 +18,7 @@ jobs:
   test: # make sure the action works on a clean machine without building
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - uses: ./
       with:
         version: v1.26

README.md

@@ -58,7 +58,7 @@ The restrictions of annotations are the following:
 
 The action was implemented with performance in mind:
 
-1. We cache data by [@actions/cache](https://github.com/actions/cache) between builds: Go build cache, Go modules cache, golangci-lint analysis cache.
+1. We cache data by [@actions/cache](https://github.com/actions/toolkit/tree/master/packages/cache) between builds: Go build cache, Go modules cache, golangci-lint analysis cache.
 2. We don't use Docker because image pulling is slow.
 3. We do as much as we can in parallel, e.g. we download cache, go and golangci-lint binary in parallel.
 
@@ -74,7 +74,7 @@ For example, in a repository of [golangci-lint](https://github.com/golangci/gola
 We use JavaScript-based action. We don't use Docker-based action because:
 
 1. docker pulling is slow currently
-2. it's easier to use caching from [@actions/cache](https://github.com/actions/cache) until GitHub team hasn't supported reusing actions from actions
+2. it's easier to use caching from [@actions/cache](https://github.com/actions/toolkit/tree/master/packages/cache)
 
 Inside our action we perform 3 steps:
 

package-lock.json

@@ -4,6 +4,20 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@actions/cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-0.2.1.tgz",
+      "integrity": "sha512-CV2D9zp+d+nL7o6XK/I7vVh350JglPMp/jHi9ppRUkdBHPUeP0UHVUfygZaAs8WmxhhWY1MI0gWah+t0QYu3Fg==",
+      "requires": {
+        "@actions/core": "^1.2.4",
+        "@actions/exec": "^1.0.1",
+        "@actions/glob": "^0.1.0",
+        "@actions/http-client": "^1.0.8",
+        "@actions/io": "^1.0.1",
+        "semver": "^6.1.0",
+        "uuid": "^3.3.3"
+      }
+    },
     "@actions/core": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.4.tgz",
@@ -446,18 +460,6 @@
       "resolved": "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz",
       "integrity": "sha1-M3dm2hWAEhD92VbCLpxokaudAzc="
     },
-    "cache": {
-      "version": "git+https://github.com/golangci/cache.git#3df9f001c2d6c950a3deb6f2c1f88ddc2a609d25",
-      "from": "git+https://github.com/golangci/cache.git",
-      "requires": {
-        "@actions/core": "^1.2.0",
-        "@actions/exec": "^1.0.1",
-        "@actions/glob": "^0.1.0",
-        "@actions/http-client": "^1.0.8",
-        "@actions/io": "^1.0.1",
-        "uuid": "^3.3.3"
-      }
-    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",

package.json

@@ -6,8 +6,7 @@
   "main": "dist/main.js",
   "scripts": {
     "prepare-setup-go": "cd node_modules/setup-go && npm run build",
-    "prepare-cache": "cd node_modules/cache && npm run build",
+    "prepare-deps": "npm run prepare-setup-go",
-    "prepare-deps": "npm run prepare-setup-go && npm run prepare-cache",
     "build": "tsc && ncc build -o dist/run/ src/main.ts && ncc build -o dist/post_run/ src/post_main.ts",
     "watched_build_main": "tsc && ncc build -w -o dist/run/ src/main.ts",
     "watched_build_post_main": "tsc && ncc build -w -o dist/post_run/ src/post_main.ts",
@@ -30,9 +29,9 @@
     "@actions/exec": "^1.0.1",
     "@actions/github": "^2.1.1",
     "@actions/tool-cache": "^1.3.4",
+    "@actions/cache": "^0.2.1",
     "@types/semver": "^7.1.0",
     "@types/tmp": "^0.2.0",
-    "cache": "git+https://github.com/golangci/cache.git",
     "setup-go": "git+https://github.com/actions/setup-go.git",
     "tmp": "^0.2.1"
   },

src/cache.ts

@@ -1,6 +1,5 @@
+import * as cache from "@actions/cache"
 import * as core from "@actions/core"
-import restore from "cache/lib/restore"
-import save from "cache/lib/save"
 import * as crypto from "crypto"
 import * as fs from "fs"
 
@@ -57,25 +56,42 @@ export async function restoreCache(): Promise<void> {
   const keys = await buildCacheKeys()
   const primaryKey = keys.pop()
   const restoreKeys = keys.reverse()
-  core.info(`Primary analysis cache key is '${primaryKey}', restore keys are '${restoreKeys.join(` | `)}'`)
-  process.env[`INPUT_RESTORE-KEYS`] = restoreKeys.join(`\n`)
-  process.env.INPUT_KEY = primaryKey
-
-  process.env.INPUT_PATH = getCacheDirs().join(`\n`)
 
   // Tell golangci-lint to use our cache directory.
   process.env.GOLANGCI_LINT_CACHE = getLintCacheDir()
-
+  if (primaryKey !== undefined) {
-  await restore()
+    try {
-  core.info(`Restored cache for golangci-lint from key '${primaryKey}' in ${Date.now() - startedAt}ms`)
+      await cache.restoreCache(getCacheDirs(), primaryKey, restoreKeys)
+      core.info(`Restored cache for golangci-lint from key '${primaryKey}' in ${Date.now() - startedAt}ms`)
+    } catch (error) {
+      if (error.name === cache.ValidationError.name) {
+        throw error
+      } else {
+        core.warning(error.message)
+      }
+    }
+  }
 }
 
 export async function saveCache(): Promise<void> {
   const startedAt = Date.now()
 
   const cacheDirs = getCacheDirs()
-  process.env.INPUT_PATH = cacheDirs.join(`\n`)
+  const keys = await buildCacheKeys()
+  const primaryKey = keys.pop()
 
-  await save()
+  if (primaryKey !== undefined) {
-  core.info(`Saved cache for golangci-lint from paths '${cacheDirs.join(`, `)}' in ${Date.now() - startedAt}ms`)
+    try {
+      await cache.saveCache(cacheDirs, primaryKey)
+      core.info(`Saved cache for golangci-lint from paths '${cacheDirs.join(`, `)}' in ${Date.now() - startedAt}ms`)
+    } catch (error) {
+      if (error.name === cache.ValidationError.name) {
+        throw error
+      } else if (error.name === cache.ReserveCacheError.name) {
+        core.info(error.message)
+      } else {
+        core.info(`[warning] ${error.message}`)
+      }
+    }
+  }
 }