From 30f2cd3d1e0f7014156d05a0b08efd6b0e92f170 Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Wed, 28 Jun 2023 13:41:47 -0600 Subject: [PATCH] chore: reconfigure windows builder storage (#19601) Use `C:` drive to build on Windows, as `D:` is too limited. --- .github/workflows/ci.generate.ts | 15 +++++++++++++++ .github/workflows/ci.yml | 6 ++++++ cli/tests/testdata/lockfile/basic/test.nolock.out | 2 +- cli/tests/testdata/test/collect.deprecated.out | 6 +++--- cli/tests/testdata/test/collect.out | 6 +++--- cli/tests/testdata/test/collect2.out | 4 ++-- cli/tests/testdata/test/filter.out | 6 +++--- cli/tests/testdata/test/shuffle.out | 6 +++--- 8 files changed, 36 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index a98eacfa72..fb6947e3ef 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 46471dc139..ec5b578fd1 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 bb62a81125..1332dfa8f1 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 9bf68807cf..7db2f276c1 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 dc5161a909..734adbe6b1 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 af31ee31e2..0c00c956a8 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 bc1ff6e018..af3e43ab81 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 fdc2ca9edc..9037ff518d 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])