Fix Windows PR Tests (#465)

I forgot to add the path override in the first pass. Also bumps timeout and upgrades trunk
trunk-io · Sep 7, 2023 · 57c8b28 · 57c8b28
1 parent e3a0c65
commit 57c8b28
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -191,6 +191,7 @@ jobs:
         with:
           linter-version: Latest
           sourcery-token: ${{ secrets.TRUNK_SOURCERY_TOKEN }}
+          cli-path: ${{ github.workspace }}\trunk.ps1
           append-args: ${{needs.detect_changes.outputs.linters-files }}
           trunk-token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }}
 
@@ -215,6 +216,7 @@ jobs:
         uses: ./.github/actions/tool_tests
         with:
           append-args: ${{needs.detect_changes.outputs.tools-files }}
+          cli-path: ${{ github.workspace }}\trunk.ps1
           trunk-token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }}
 
   # Run repo healthcheck tests

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -2,7 +2,7 @@ version: 0.1
 
 # version used for local trunk runs and testing
 cli:
-  version: 1.14.2
+  version: 1.15.0
 
 api:
   address: api.trunk-staging.io:8443

diff --git a/tests/repo_tests/config_check.test.ts b/tests/repo_tests/config_check.test.ts
@@ -1,7 +1,7 @@
 import * as fs from "fs";
 import path from "path";
 import { setupDriver } from "tests";
-import { REPO_ROOT } from "tests/utils";
+import { osTimeoutMultiplier, REPO_ROOT } from "tests/utils";
 
 // Avoid strictly typing composite config
 // trunk-ignore-all(eslint/@typescript-eslint/no-unsafe-assignment)
@@ -10,6 +10,8 @@ import { REPO_ROOT } from "tests/utils";
 // trunk-ignore-all(eslint/@typescript-eslint/no-unsafe-argument)
 // trunk-ignore-all(eslint/@typescript-eslint/no-unsafe-return)
 
+jest.setTimeout(300000 * osTimeoutMultiplier); // 300s or 900s
+
 /**
  * This test runs 'trunk config print' from the root of the repository to verify a healthy config.
  * This serves as a general, basic healthcheck and asserts that all definitions resolve correctly,