build: experiment with windows testingt pusht

Author: devversion

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

@@ -3,7 +3,7 @@
 # This file should be checked into version control along with the pnpm-lock.yaml file.
 .npmrc=-1406867100
 modules/testing/builder/package.json=973445093
-package.json=2054604346
+package.json=1304652347
 packages/angular/build/package.json=-1460726595
 packages/angular/cli/package.json=-1917515334
 packages/angular/pwa/package.json=1108903917
@@ -17,6 +17,6 @@ packages/angular_devkit/schematics/package.json=673943597
 packages/angular_devkit/schematics_cli/package.json=-2026655035
 packages/ngtools/webpack/package.json=1021868664
 packages/schematics/angular/package.json=251715148
-pnpm-lock.yaml=-677899779
+pnpm-lock.yaml=1771894907
 pnpm-workspace.yaml=-1056556036
-yarn.lock=-535855759
+yarn.lock=637807544

.bazelrc

@@ -33,10 +33,6 @@ test:no-sharding --flaky_test_attempts=1 --test_sharding_strategy=disabled
 # See https://github.com/bazelbuild/bazel/issues/4603
 build --symlink_prefix=dist/
 
-# Disable watchfs as it causes tests to be flaky on Windows
-# https://github.com/angular/angular/issues/29541
-build --nowatchfs
-
 # Turn off legacy external runfiles
 build --nolegacy_external_runfiles
 
@@ -162,10 +158,6 @@ build:remote-cache --google_default_credentials
 # Fixes use of npm paths with spaces such as some within the puppeteer module
 build --experimental_inprocess_symlink_creation
 
-# Enable runfiles even on Windows.
-# Architect resolves output files from data files, and this isn't possible without runfile support.
-build --enable_runfiles
-
 ####################################################
 # rules_js specific flags
 ####################################################

.github/workflows/ci.yml

@@ -87,9 +87,7 @@ jobs:
             node: 20
     runs-on: ${{ matrix.os }}
     steps:
-      # Workaround for: https://github.com/bazel-contrib/bazel-lib/issues/968.
-      # TODO(devversion): Remove when Aspect lib issue is fixed.
-      - run: choco install gzip
+      - uses: Vampire/setup-wsl@v4
         if: ${{matrix.os == 'windows-latest'}}
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b015169b635123c1ab9084f604e36b6342eac171

.github/workflows/pr.yml

@@ -126,22 +126,98 @@ jobs:
         run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
   e2e-windows-subset:
-    needs: build
+    # needs: build
     runs-on: windows-latest
     steps:
-      # Workaround for: https://github.com/bazel-contrib/bazel-lib/issues/968.
-      # TODO(devversion): Remove when Aspect lib issue is fixed.
-      - run: choco install gzip
+      # Git checkout converts to CRLF by default. This causes the Aspect lock
+      # files to differ. See: https://github.com/actions/checkout/issues/135.
+      - run: |
+          git config --system core.autocrlf false
+          git config --system core.eol lf
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b015169b635123c1ab9084f604e36b6342eac171
       - name: Install node modules
         run: yarn install --immutable
       - name: Setup Bazel
         uses: angular/dev-infra/github-actions/bazel/setup@b015169b635123c1ab9084f604e36b6342eac171
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@b015169b635123c1ab9084f604e36b6342eac171
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@a5e90c88a0fc012de199fe6f148c12b5476d6d1b
+
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        with:
+          detached: true
+
+      - uses: Vampire/setup-wsl@v4
+        with:
+          wsl-conf: |
+            [interop]
+              appendWindowsPath=false
+            [wsl2]
+              networkingMode=mirrored
+          wsl-shell-command: bash --login -euo pipefail
+          additional-packages: |
+            curl
+            ca-certificates
+            g++
+            unzip
+            zip
+            git
+            python3
+            tar
+      - name: Setup nvm
+        shell: wsl-bash {0}
+        run: |
+          curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash
+          export NVM_DIR="$HOME/.nvm"
+          # Note: Specify `--install` due to https://github.com/nvm-sh/nvm/issues/1985.
+          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" --install
+      - run: nvm install
+        shell: wsl-bash {0}
+      - run: npm install -g yarn@1
+        shell: wsl-bash {0}
+      - name: Install node modules in WSL (re-using from previous install/cache restore)
+        run: yarn install --immutable
+        shell: wsl-bash {0}
+      - name: Determining paths for WSL usage
+        id: wsl_paths
+        run: |
+          cmd_path=$(which cmd.exe)
+          cmd_wsl_path=$(wsl exec wslpath -u $cmd_path)
+          npm_path=$(which npm)
+          npm_wls_path=$(wsl exec wslpath -u "$npm_path")
+          tmp_dir_wsl_path=$(wsl exec wslpath -u "/tmp")
+
+          git_bin=$(which git)
+          git_bin_wsl_path=$(wsl exec wslpath -u "$git_bin")
+
+          echo "cmd_path=$cmd_wsl_path" >> $GITHUB_OUTPUT
+          echo "npm_path=$npm_wls_path" >> $GITHUB_OUTPUT
+          echo "tmp_path=$tmp_dir_wsl_path" >> $GITHUB_OUTPUT
+          echo "git_path=$git_bin_wsl_path" >> $GITHUB_OUTPUT
+      - name: Create link to WSL drive
+        shell: powershell
+        run: New-Item -ItemType SymbolicLink -Path "C:\wsl_root" -Target "\\wsl.localhost\Debian"
       - name: Run CLI E2E tests
-        run: yarn bazel test --config=e2e //tests/legacy-cli:e2e_node22 --test_filter="tests/basic/{build,rebuild}.ts" --test_arg="--esbuild"
+        env:
+          # See: https://devblogs.microsoft.com/commandline/share-environment-vars-between-wsl-and-windows
+          WSLENV: 'GOOGLE_APPLICATION_CREDENTIALS/p'
+        run: |
+          yarn bazel build \
+              --config=e2e //tests/legacy-cli:e2e_node22
+
+          yarn bazel test \
+              --config=e2e //tests/legacy-cli:e2e_node22 \
+              --spawn_strategy=local \
+              --test_filter="tests/basic/{build,rebuild}.ts" \
+              --test_arg="--esbuild" \
+              --test_env="NG_E2E_RUNNER_WSL_ROOT=C:\wsl_root" \
+              --test_env="NG_E2E_RUNNER_WSL_UNC_BASE=\\\\wsl.localhost\Debian" \
+              --test_env="NG_E2E_RUNNER_WINDOWS_CMD=${{steps.wsl_paths.outputs.cmd_path}}" \
+              --test_env="NG_E2E_RUNNER_WINDOWS_NPM=${{steps.wsl_paths.outputs.npm_path}}" \
+              --test_env="NG_E2E_RUNNER_WINDOWS_TMP_DIR=${{steps.wsl_paths.outputs.tmp_path}}" \
+              --test_env="NG_E2E_RUNNER_WINDOWS_GIT_BASH_BIN=${{steps.wsl_paths.outputs.git_path}}"
+        shell: wsl-bash {0}
 
   e2e-package-managers:
     needs: build
@@ -161,7 +237,7 @@ jobs:
       - name: Setup Bazel
         uses: angular/dev-infra/github-actions/bazel/setup@b015169b635123c1ab9084f604e36b6342eac171
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@b015169b635123c1ab9084f604e36b6342eac171
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@3bfa6d8c9861c6477a52146828382a3d5043005f
       - name: Run CLI E2E tests
         run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 

WORKSPACE

@@ -2,12 +2,6 @@ workspace(name = "angular_cli")
 
 DEFAULT_NODE_VERSION = "18.19.1"
 
-# Workaround for: https://github.com/bazel-contrib/bazel-lib/issues/968.
-# Override toolchain for tar on windows.
-register_toolchains(
-    "//tools:windows_tar_system_toolchain",
-)
-
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
 
 http_archive(
@@ -164,7 +158,6 @@ register_toolchains(
     "@npm//@angular/build-tooling/bazel/git-toolchain:git_linux_toolchain",
     "@npm//@angular/build-tooling/bazel/git-toolchain:git_macos_x86_toolchain",
     "@npm//@angular/build-tooling/bazel/git-toolchain:git_macos_arm64_toolchain",
-    "@npm//@angular/build-tooling/bazel/git-toolchain:git_windows_toolchain",
 )
 
 load("@npm//@angular/build-tooling/bazel/browsers:browser_repositories.bzl", "browser_repositories")
@@ -230,8 +223,6 @@ npm_repositories()
 
 http_archive(
     name = "aspect_rules_ts",
-    patch_args = ["-p1"],
-    patches = ["//tools:rules_ts_windows.patch"],
     sha256 = "4263532b2fb4d16f309d80e3597191a1cb2fb69c19e95d91711bd6b97874705e",
     strip_prefix = "rules_ts-3.5.0",
     url = "https://github.com/aspect-build/rules_ts/releases/download/v3.5.0/rules_ts-v3.5.0.tar.gz",

package.json

@@ -45,7 +45,7 @@
     "@ampproject/remapping": "2.3.0",
     "@angular/animations": "19.2.0-next.2",
     "@angular/bazel": "https://github.com/angular/bazel-builds.git#cee20fd0958b532ee7c48a5859b682fb5573b2ce",
-    "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#a6a996a69cfc03b3fbe538f11dd24b7bc4b30592",
+    "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#d4727212a9d0f7eb63ae3116d73c769d9bd0bdc1",
     "@angular/cdk": "19.2.0-next.4",
     "@angular/common": "19.2.0-next.2",
     "@angular/compiler": "19.2.0-next.2",

pnpm-lock.yaml

@@ -0,0 +1,18 @@
+set -e
+
+yarn bazel build \
+    --config=e2e //tests/legacy-cli:e2e_node22
+
+yarn bazel test \
+    --config=e2e //tests/legacy-cli:e2e_node22 \
+    --spawn_strategy=local \
+    --test_filter="tests/basic/{build,rebuild}.ts" \
+    --test_arg="--esbuild" \
+    --test_env="NG_E2E_RUNNER_WSL_ROOT=C:\wsl_root" \
+    --test_env="NG_E2E_RUNNER_WSL_UNC_BASE=\\\\wsl.localhost\Debian" \
+    --test_env="NG_E2E_RUNNER_WINDOWS_CMD=/mnt/c/Windows/system32/cmd.exe" \
+    --test_env="NG_E2E_RUNNER_WINDOWS_NPM=C:\Program Files\nodejs\npm" \
+    --test_env="NG_E2E_RUNNER_WINDOWS_TMP_DIR=/mnt/c/Users/paulg/AppData/Local/Temp" \
+    --test_env="NG_E2E_RUNNER_WINDOWS_GIT_BASH_BIN=/mnt/c/Program Files/Git/bin/git" \
+    --test_output=streamed \
+    --flaky_test_attempts=1

test.sh

@@ -71,18 +71,25 @@ def e2e_suites(name, runner, data):
     """
 
     # Pre-configured test suites
-    for toolchain_name, toolchain in zip(
+    for toolchain_name, (toolchain, windows_node_repo) in zip(
         TOOLCHAINS_NAMES,
         TOOLCHAINS_VERSIONS,
     ):
         # Default target meant to be run manually for debugging, customizing test cli via bazel
-        _e2e_tests(name + "_" + toolchain_name, runner, data = data, toolchain = toolchain, tags = ["manual"])
-
-        _e2e_suite(name, runner, "npm", data, toolchain_name, toolchain)
-        _e2e_suite(name, runner, "bun", data, toolchain_name, toolchain)
-        _e2e_suite(name, runner, "pnpm", data, toolchain_name, toolchain)
-        _e2e_suite(name, runner, "yarn", data, toolchain_name, toolchain)
-        _e2e_suite(name, runner, "esbuild", data, toolchain_name, toolchain)
+        _e2e_tests(
+            name + "_" + toolchain_name,
+            runner,
+            data = data,
+            toolchain = toolchain,
+            windows_node_repo = windows_node_repo,
+            tags = ["manual"],
+        )
+
+        _e2e_suite(name, runner, "npm", data, toolchain_name, toolchain, windows_node_repo)
+        _e2e_suite(name, runner, "bun", data, toolchain_name, toolchain, windows_node_repo)
+        _e2e_suite(name, runner, "pnpm", data, toolchain_name, toolchain, windows_node_repo)
+        _e2e_suite(name, runner, "yarn", data, toolchain_name, toolchain, windows_node_repo)
+        _e2e_suite(name, runner, "esbuild", data, toolchain_name, toolchain, windows_node_repo)
 
     # Saucelabs tests are only run on the default toolchain
     _e2e_suite(name, runner, "saucelabs", data)
@@ -119,6 +126,23 @@ def _e2e_tests(name, runner, **kwargs):
     toolchains = toolchains + ["@npm//@angular/build-tooling/bazel/browsers/chromium:toolchain_alias"]
     data = data + ["@npm//@angular/build-tooling/bazel/browsers/chromium"]
 
+    windows_node_repo = kwargs.pop("windows_node_repo", None)
+    windows_node_files = [
+        "@%s//:node_files" % windows_node_repo,
+        "@%s//:npm_files" % windows_node_repo,
+        "@%s//:bin/npm.cmd" % windows_node_repo,
+    ]
+
+    data = select({
+        "@bazel_tools//src/conditions:windows": data + windows_node_files,
+        "//conditions:default": data + windows_node_files,
+        #"//conditions:default": data,
+    })
+
+    env.update({
+        "NG_E2E_WINDOWS_REPO_SHORT_PATH": "../%s" % windows_node_repo,
+    })
+
     nodejs_test(
         name = name,
         templated_args = args,
@@ -131,7 +155,7 @@ def _e2e_tests(name, runner, **kwargs):
         **kwargs
     )
 
-def _e2e_suite(name, runner, type, data, toolchain_name = "", toolchain = None):
+def _e2e_suite(name, runner, type, data, toolchain_name = "", toolchain = None, windows_node_repo = None):
     """
     Setup a predefined test suite (yarn|pnpm|bun|esbuild|saucelabs|npm).
     """
@@ -166,6 +190,7 @@ def _e2e_suite(name, runner, type, data, toolchain_name = "", toolchain = None):
         size = "enormous",
         data = data,
         toolchain = toolchain,
+        windows_node_repo = windows_node_repo,
         shard_count = TEST_SHARD_COUNT,
         templated_args = args + [
             "--glob=%s" % _to_glob(tests) if tests else "",
@@ -180,6 +205,7 @@ def _e2e_suite(name, runner, type, data, toolchain_name = "", toolchain = None):
         size = "enormous",
         data = data,
         toolchain = toolchain,
+        windows_node_repo = windows_node_repo,
         shard_count = TEST_SHARD_COUNT,
         templated_args = args + [
             "--ng-snapshots",

tests/legacy-cli/e2e.bzl

@@ -1,5 +1,6 @@
 import { getActivePackageManager } from '../utils/packages';
 import { exec, ng } from '../utils/process';
+import { isWindowsTestMode } from '../utils/wsl';
 
 export default async function () {
   console.log('Environment:');
@@ -14,6 +15,10 @@ export default async function () {
     console.log(`  ${envName}: ${process.env[envName]!.replace(/[\n\r]+/g, '\n        ')}`);
   });
 
-  await exec('which', 'ng', getActivePackageManager());
+  // On Windows, `which` might not be available.
+  if (!isWindowsTestMode()) {
+    await exec('which', 'ng', getActivePackageManager());
+  }
+
   await ng('version');
 }