Merge pull request #239 from reviewdog/save-cache-always

Save cache always
reviewdog · Mar 11, 2022 · 03507ec · 03507ec
2 parents 6d205b0 + 77f8013
commit 03507ec
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 59 deletions.
diff --git a/__test__/installer.test.ts b/__test__/installer.test.ts
@@ -1,14 +1,14 @@
-import {promises as fs} from 'fs';
-import * as path from 'path';
+import { promises as fs } from "fs";
+import * as path from "path";
 
-const tempDir = path.join(__dirname, '_temp');
-process.env['RUNNER_TEMP'] = tempDir;
+const tempDir = path.join(__dirname, "_temp");
+process.env["RUNNER_TEMP"] = tempDir;
 
-import * as io from '@actions/io';
-import * as exec from '@actions/exec';
-import * as installer from '../src/installer';
+import * as io from "@actions/io";
+import * as exec from "@actions/exec";
+import * as installer from "../src/installer";
 
-describe('installer', () => {
+describe("installer", () => {
   beforeAll(async () => {
     await io.mkdirP(tempDir);
   });
@@ -17,27 +17,43 @@ describe('installer', () => {
     await io.rmRF(tempDir);
   });
 
-  it('installs specific version of reviewdog', async () => {
-    const dir = await fs.mkdtemp(path.join(tempDir, 'reviewdog-'));
-    const reviewdog = await installer.installReviewdog('v0.12.0', dir);
-    await exec.exec(reviewdog, ['--version']);
-  }, 10000);
-
-  it('installs the latest version of reviewdog', async () => {
-    const dir = await fs.mkdtemp(path.join(tempDir, 'reviewdog-'));
-    const reviewdog = await installer.installReviewdog('latest', dir);
-    await exec.exec(reviewdog, ['--version']);
-  }, 10000);
-
-  it('installs specific version of golangci-lint', async () => {
-    const dir = await fs.mkdtemp(path.join(tempDir, 'golangci-'));
-    const golangci = await installer.installGolangciLint('v1.41.1', dir);
-    await exec.exec(golangci, ['--version']);
-  }, 20000);
-
-  it('installs the latest version of golangci-lint', async () => {
-    const dir = await fs.mkdtemp(path.join(tempDir, 'golangci-'));
-    const golangci = await installer.installGolangciLint('latest', dir);
-    await exec.exec(golangci, ['--version']);
-  }, 20000);
+  it(
+    "installs specific version of reviewdog",
+    async () => {
+      const dir = await fs.mkdtemp(path.join(tempDir, "reviewdog-"));
+      const reviewdog = await installer.installReviewdog("v0.12.0", dir);
+      await exec.exec(reviewdog, ["--version"]);
+    },
+    5 * 60 * 1000
+  );
+
+  it(
+    "installs the latest version of reviewdog",
+    async () => {
+      const dir = await fs.mkdtemp(path.join(tempDir, "reviewdog-"));
+      const reviewdog = await installer.installReviewdog("latest", dir);
+      await exec.exec(reviewdog, ["--version"]);
+    },
+    5 * 60 * 1000
+  );
+
+  it(
+    "installs specific version of golangci-lint",
+    async () => {
+      const dir = await fs.mkdtemp(path.join(tempDir, "golangci-"));
+      const golangci = await installer.installGolangciLint("v1.41.1", dir);
+      await exec.exec(golangci, ["--version"]);
+    },
+    5 * 60 * 1000
+  );
+
+  it(
+    "installs the latest version of golangci-lint",
+    async () => {
+      const dir = await fs.mkdtemp(path.join(tempDir, "golangci-"));
+      const golangci = await installer.installGolangciLint("latest", dir);
+      await exec.exec(golangci, ["--version"]);
+    },
+    5 * 60 * 1000
+  );
 });
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -57,7 +57,7 @@ async function run() {
       });
     }
 
-    await core.group("Running golangci-lint with reviewdog 🐶 ...", async () => {
+    const code = await core.group("Running golangci-lint with reviewdog 🐶 ...", async (): Promise<number> => {
       const output = await exec.getExecOutput(
         golangci,
         ["run", "--out-format", "line-number", ...flags.parse(golangciLintFlags)],
@@ -68,7 +68,7 @@ async function run() {
       );
 
       process.env["REVIEWDOG_GITHUB_API_TOKEN"] = core.getInput("github_token");
-      await exec.exec(
+      return await exec.exec(
         reviewdog,
         [
           "-f=golangci-lint",
@@ -82,6 +82,7 @@ async function run() {
         {
           cwd,
           input: Buffer.from(output.stdout, "utf-8"),
+          ignoreReturnCode: true,
         }
       );
     });
@@ -93,6 +94,10 @@ async function run() {
         }
       });
     }
+
+    if (code !== 0) {
+      core.setFailed(`reviewdog exited with status code: ${code}`);
+    }
   } catch (error) {
     if (error instanceof Error) {
       core.setFailed(error);

diff --git a/src/setup-go/main.ts b/src/setup-go/main.ts
@@ -29,10 +29,6 @@ export async function run(versionSpec: string): Promise<void> {
       core.info(`Successfully setup go version ${versionSpec}`);
     }
 
-    // add problem matchers
-    const matchersPath = path.join(__dirname, "..", "matchers.json");
-    core.info(`##[add-matcher]${matchersPath}`);
-
     // output the version actually being used
     const goPath = await io.which("go");
     const goVersion = (cp.execSync(`${goPath} version`) || "").toString();

diff --git a/src/setup-go/matchers.json b/src/setup-go/matchers.json