summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-x.github/workflows/ci.generate.ts15
-rw-r--r--.github/workflows/ci.yml6
-rw-r--r--cli/tests/testdata/lockfile/basic/test.nolock.out2
-rw-r--r--cli/tests/testdata/test/collect.deprecated.out6
-rw-r--r--cli/tests/testdata/test/collect.out6
-rw-r--r--cli/tests/testdata/test/collect2.out4
-rw-r--r--cli/tests/testdata/test/filter.out6
-rw-r--r--cli/tests/testdata/test/shuffle.out6
8 files changed, 36 insertions, 15 deletions
diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
index a98eacfa7..fb6947e3e 100755
--- a/.github/workflows/ci.generate.ts
+++ b/.github/workflows/ci.generate.ts
@@ -104,6 +104,20 @@ CFLAGS=-flto=thin --sysroot=/sysroot
__0`,
};
+// The Windows builder is a little strange -- there's lots of room on C: and not so much on D:
+// We'll check out to D:, but then all of our builds should happen on a C:-mapped drive
+const reconfigureWindowsStorage = {
+ name: "Reconfigure Windows Storage",
+ if: [
+ "startsWith(matrix.os, 'windows')",
+ ],
+ shell: "pwsh",
+ run: `
+New-Item -ItemType "directory" -Path "$env:TEMP/__target__"
+New-Item -ItemType Junction -Target "$env:TEMP/__target__" -Path "D:/a/deno/deno"
+`.trim(),
+};
+
const cloneRepoStep = [{
name: "Configure git",
run: [
@@ -368,6 +382,7 @@ const ci = {
RUST_BACKTRACE: "full",
},
steps: skipJobsIfPrAndMarkedSkip([
+ reconfigureWindowsStorage,
...cloneRepoStep,
submoduleStep("./test_util/std"),
submoduleStep("./third_party"),
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 46471dc13..ec5b578fd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -100,6 +100,12 @@ jobs:
CARGO_TERM_COLOR: always
RUST_BACKTRACE: full
steps:
+ - name: Reconfigure Windows Storage
+ if: '!(github.event_name == ''pull_request'' && matrix.skip_pr) && (startsWith(matrix.os, ''windows''))'
+ shell: pwsh
+ run: |-
+ New-Item -ItemType "directory" -Path "$env:TEMP/__target__"
+ New-Item -ItemType Junction -Target "$env:TEMP/__target__" -Path "D:/a/deno/deno"
- name: Configure git
run: |-
git config --global core.symlinks true
diff --git a/cli/tests/testdata/lockfile/basic/test.nolock.out b/cli/tests/testdata/lockfile/basic/test.nolock.out
index bb62a8112..1332dfa8f 100644
--- a/cli/tests/testdata/lockfile/basic/test.nolock.out
+++ b/cli/tests/testdata/lockfile/basic/test.nolock.out
@@ -1,4 +1,4 @@
Download http://localhost:4545/lockfile/basic/mod.ts
Check file:///[WILDCARD]/main.test.ts
-running 1 test from ./main.test.ts
+running 1 test from [WILDCARD]/main.test.ts
[WILDCARD]
diff --git a/cli/tests/testdata/test/collect.deprecated.out b/cli/tests/testdata/test/collect.deprecated.out
index 9bf68807c..7db2f276c 100644
--- a/cli/tests/testdata/test/collect.deprecated.out
+++ b/cli/tests/testdata/test/collect.deprecated.out
@@ -2,9 +2,9 @@ Warning: "files" configuration is deprecated. Please use "include" and "exclude"
Check [WILDCARD]/test/collect/include/2_test.ts
Check [WILDCARD]/test/collect/include/test.ts
Check [WILDCARD]/test/collect/test.ts
-running 0 tests from ./test/collect/include/2_test.ts
-running 0 tests from ./test/collect/include/test.ts
-running 0 tests from ./test/collect/test.ts
+running 0 tests from [WILDCARD]/test/collect/include/2_test.ts
+running 0 tests from [WILDCARD]/test/collect/include/test.ts
+running 0 tests from [WILDCARD]/test/collect/test.ts
ok | 0 passed | 0 failed ([WILDCARD])
diff --git a/cli/tests/testdata/test/collect.out b/cli/tests/testdata/test/collect.out
index dc5161a90..734adbe6b 100644
--- a/cli/tests/testdata/test/collect.out
+++ b/cli/tests/testdata/test/collect.out
@@ -1,9 +1,9 @@
Check [WILDCARD]/test/collect/include/2_test.ts
Check [WILDCARD]/test/collect/include/test.ts
Check [WILDCARD]/test/collect/test.ts
-running 0 tests from ./test/collect/include/2_test.ts
-running 0 tests from ./test/collect/include/test.ts
-running 0 tests from ./test/collect/test.ts
+running 0 tests from [WILDCARD]/test/collect/include/2_test.ts
+running 0 tests from [WILDCARD]/test/collect/include/test.ts
+running 0 tests from [WILDCARD]/test/collect/test.ts
ok | 0 passed | 0 failed ([WILDCARD])
diff --git a/cli/tests/testdata/test/collect2.out b/cli/tests/testdata/test/collect2.out
index af31ee31e..0c00c956a 100644
--- a/cli/tests/testdata/test/collect2.out
+++ b/cli/tests/testdata/test/collect2.out
@@ -1,7 +1,7 @@
Check [WILDCARD]/test/collect/include/test.ts
Check [WILDCARD]/test/collect/test.ts
-running 0 tests from ./test/collect/include/test.ts
-running 0 tests from ./test/collect/test.ts
+running 0 tests from [WILDCARD]/test/collect/include/test.ts
+running 0 tests from [WILDCARD]/test/collect/test.ts
ok | 0 passed | 0 failed ([WILDCARD])
diff --git a/cli/tests/testdata/test/filter.out b/cli/tests/testdata/test/filter.out
index bc1ff6e01..af3e43ab8 100644
--- a/cli/tests/testdata/test/filter.out
+++ b/cli/tests/testdata/test/filter.out
@@ -1,11 +1,11 @@
Check [WILDCARD]/test/filter/a_test.ts
Check [WILDCARD]/test/filter/b_test.ts
Check [WILDCARD]/test/filter/c_test.ts
-running 1 test from ./test/filter/a_test.ts
+running 1 test from [WILDCARD]/test/filter/a_test.ts
foo ... ok ([WILDCARD])
-running 1 test from ./test/filter/b_test.ts
+running 1 test from [WILDCARD]/test/filter/b_test.ts
foo ... ok ([WILDCARD])
-running 1 test from ./test/filter/c_test.ts
+running 1 test from [WILDCARD]/test/filter/c_test.ts
foo ... ok ([WILDCARD])
ok | 3 passed | 0 failed | 6 filtered out ([WILDCARD])
diff --git a/cli/tests/testdata/test/shuffle.out b/cli/tests/testdata/test/shuffle.out
index fdc2ca9ed..9037ff518 100644
--- a/cli/tests/testdata/test/shuffle.out
+++ b/cli/tests/testdata/test/shuffle.out
@@ -1,7 +1,7 @@
Check [WILDCARD]/test/shuffle/bar_test.ts
Check [WILDCARD]/test/shuffle/baz_test.ts
Check [WILDCARD]/test/shuffle/foo_test.ts
-running 10 tests from ./test/shuffle/foo_test.ts
+running 10 tests from [WILDCARD]/test/shuffle/foo_test.ts
test 3 ... ok ([WILDCARD])
test 2 ... ok ([WILDCARD])
test 7 ... ok ([WILDCARD])
@@ -12,7 +12,7 @@ test 9 ... ok ([WILDCARD])
test 4 ... ok ([WILDCARD])
test 6 ... ok ([WILDCARD])
test 1 ... ok ([WILDCARD])
-running 10 tests from ./test/shuffle/baz_test.ts
+running 10 tests from [WILDCARD]/test/shuffle/baz_test.ts
test 3 ... ok ([WILDCARD])
test 2 ... ok ([WILDCARD])
test 7 ... ok ([WILDCARD])
@@ -23,7 +23,7 @@ test 9 ... ok ([WILDCARD])
test 4 ... ok ([WILDCARD])
test 6 ... ok ([WILDCARD])
test 1 ... ok ([WILDCARD])
-running 10 tests from ./test/shuffle/bar_test.ts
+running 10 tests from [WILDCARD]/test/shuffle/bar_test.ts
test 3 ... ok ([WILDCARD])
test 2 ... ok ([WILDCARD])
test 7 ... ok ([WILDCARD])
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 18:17:56 +0000