Bump cli version (#438)

Some other fixes:
- Bump renovate tool timeout (Windows debugging)
- Add logs to debug Windows eslint JSON errors
- Fix `run_from_root_file`/`run_from_root_target` discrepancies

Author: TylerJang27

.github/actions/linter_tests/action.yaml

@@ -71,6 +71,8 @@ runs:
         PLUGINS_TEST_CLI_VERSION: ${{ inputs.cli-version }}
         PLUGINS_TEST_CLI_PATH: ${{ inputs.cli-path }}
         SOURCERY_TOKEN: ${{ inputs.sourcery-token }}
+        # Debug recurrent eslint circular JSON errors
+        DEBUG: Driver:eslint:*
 
     - name: Run plugin tests
       if: runner.os != 'Windows'

.trunk/trunk.yaml

@@ -2,7 +2,7 @@ version: 0.1
 
 # version used for local trunk runs and testing
 cli:
-  version: 1.13.1-beta.25
+  version: 1.13.1-beta.36
 
 api:
   address: api.trunk-staging.io:8443

linters/buf/plugin.yaml

@@ -66,7 +66,7 @@ lint:
           run: buf lint --path ${target} --error-format json
           success_codes: [0, 100]
           run_linter_from: root_file
-      run_from_root_file: buf.yaml
+          run_from_root_target: buf.yaml
       direct_configs: [buf.yaml]
       suggest_if: config_present
       environment:
@@ -101,7 +101,7 @@ lint:
           # buf is configured to not follow symlinks, and relies on git state, so don't cache results
           sandbox_type: copy_targets
           cache_results: false
-      run_from_root_file: buf.work.yaml
+          run_from_root_target: buf.work.yaml
       direct_configs: [buf.yaml, buf.work.yaml]
       environment:
         - name: PATH

linters/gokart/gokart.test.ts

@@ -1,3 +1,9 @@
-import { customLinterCheckTest } from "tests";
+import path from "path";
+import { customLinterCheckTest, TestCallback } from "tests";
+import { TEST_DATA } from "tests/utils";
 
-customLinterCheckTest({ linterName: "gokart", args: "-a -y" });
+const preCheck: TestCallback = (driver) => {
+  driver.moveFile(path.join(TEST_DATA, "go.mod"), "go.mod");
+};
+
+customLinterCheckTest({ linterName: "gokart", args: "-a -y", preCheck });

linters/gokart/plugin.yaml

@@ -15,7 +15,6 @@ lint:
       environment:
         - name: PATH
           list: ["${linter}"]
-      run_from_root_file: go.mod
       commands:
         - name: lint
           output: sarif
@@ -26,6 +25,7 @@ lint:
           # gokart runs on directory targets but requires these directories to not be symlinks
           sandbox_type: expanded
           run_linter_from: root_file
+          run_from_root_target: go.mod
           is_security: true
       direct_configs:
         - analyzers.yml

linters/golangci-lint/golangci_lint.test.ts

@@ -3,18 +3,11 @@ import { customLinterCheckTest } from "tests";
 import { TrunkLintDriver } from "tests/driver";
 import { TEST_DATA } from "tests/utils";
 
-const preCheck = (driver: TrunkLintDriver) => {
-  ["go.mod", ".golangci.yml"].forEach((file) => {
-    // trunk-ignore(semgrep): paths used here are safe
-    driver.moveFile(path.join(TEST_DATA, file), file);
-  });
-};
-
-customLinterCheckTest({ linterName: "golangci-lint", args: "-a -y", preCheck });
+customLinterCheckTest({ linterName: "golangci-lint", args: "-a -y" });
 
 // Adding an empty file will cause some other issues to be suppressed.
 const addEmpty = (driver: TrunkLintDriver) => {
-  driver.writeFile("empty.go", "");
+  driver.writeFile(path.join(TEST_DATA, "empty.go"), "");
 };
 
 customLinterCheckTest({

linters/golangci-lint/plugin.yaml

@@ -17,7 +17,6 @@ lint:
           optional: true
       runtime: go
       package: github.com/golangci/golangci-lint/cmd/golangci-lint
-      run_from_root_file: go.mod
       commands:
         - name: lint
           # Custom parser type defined in the trunk cli to handle golangci-lint's JSON output.
@@ -38,6 +37,7 @@ lint:
           # 7 - error logged
           success_codes: [0, 2, 7]
           run_linter_from: root_file
+          run_from_root_target: go.mod
           disable_upstream: true # TODO(Sam): re-enable the upstream for golang (needs test coverage)
       suggest_if: files_present
       direct_configs:

linters/golangci-lint/test_data/golangci_lint_v1.46.2_empty.check.shot

@@ -6,25 +6,14 @@ exports[`Testing linter golangci-lint test empty 1`] = `
     {
       "code": "typecheck",
       "column": "1",
-      "file": "empty.go",
+      "file": "test_data/empty.go",
       "issueUrl": "https://golangci-lint.run/usage/linters/",
       "level": "LEVEL_HIGH",
       "line": "1",
       "linter": "golangci-lint",
       "message": "expected 'package', found 'EOF'",
       "targetType": "go",
     },
-    {
-      "code": "deadcode",
-      "column": "6",
-      "file": "test_data/unused_func.go",
-      "issueUrl": "https://golangci-lint.run/usage/linters/",
-      "level": "LEVEL_HIGH",
-      "line": "5",
-      "linter": "golangci-lint",
-      "message": "\`helper\` is unused",
-      "targetType": "go",
-    },
     {
       "code": "typecheck",
       "column": "23",
@@ -38,15 +27,6 @@ exports[`Testing linter golangci-lint test empty 1`] = `
     },
   ],
   "lintActions": [
-    {
-      "command": "lint",
-      "fileGroupName": "go",
-      "linter": "golangci-lint",
-      "paths": [
-        ".",
-      ],
-      "verb": "TRUNK_VERB_CHECK",
-    },
     {
       "command": "lint",
       "fileGroupName": "go",

linters/golangci-lint/test_data/golangci_lint_v1.49.0_empty.check.shot

@@ -6,25 +6,14 @@ exports[`Testing linter golangci-lint test empty 1`] = `
     {
       "code": "typecheck",
       "column": "1",
-      "file": "empty.go",
+      "file": "test_data/empty.go",
       "issueUrl": "https://golangci-lint.run/usage/linters/",
       "level": "LEVEL_HIGH",
       "line": "1",
       "linter": "golangci-lint",
       "message": "expected 'package', found 'EOF'",
       "targetType": "go",
     },
-    {
-      "code": "unused",
-      "column": "6",
-      "file": "test_data/unused_func.go",
-      "issueUrl": "https://golangci-lint.run/usage/linters/",
-      "level": "LEVEL_HIGH",
-      "line": "5",
-      "linter": "golangci-lint",
-      "message": "func \`helper\` is unused",
-      "targetType": "go",
-    },
     {
       "code": "typecheck",
       "column": "23",
@@ -38,15 +27,6 @@ exports[`Testing linter golangci-lint test empty 1`] = `
     },
   ],
   "lintActions": [
-    {
-      "command": "lint",
-      "fileGroupName": "go",
-      "linter": "golangci-lint",
-      "paths": [
-        ".",
-      ],
-      "verb": "TRUNK_VERB_CHECK",
-    },
     {
       "command": "lint",
       "fileGroupName": "go",

tools/renovate/renovate.test.ts

@@ -1,4 +1,8 @@
 import { makeToolTestConfig, toolTest } from "tests";
+import { osTimeoutMultiplier } from "tests/utils";
+
+jest.setTimeout(600000 * osTimeoutMultiplier); // 300s or 900s
+
 toolTest({
   toolName: "renovate",
   toolVersion: "34.122.0",