build: experiment with windows testingt push

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=-1990485513
+package.json=1554529784
 packages/angular/build/package.json=-1875938558
 packages/angular/cli/package.json=-803141029
 packages/angular/pwa/package.json=1108903917
@@ -17,6 +17,6 @@ packages/angular_devkit/schematics/package.json=673943597
 packages/angular_devkit/schematics_cli/package.json=774399812
 packages/ngtools/webpack/package.json=1021868664
 packages/schematics/angular/package.json=251715148
-pnpm-lock.yaml=543305912
+pnpm-lock.yaml=1923723008
 pnpm-workspace.yaml=-1056556036
-yarn.lock=-1771973873
+yarn.lock=590940374

.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,63 @@ 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
+    env:
+      # See: https://devblogs.microsoft.com/commandline/share-environment-vars-between-wsl-and-windows
+      WSLENV: 'GOOGLE_APPLICATION_CREDENTIALS/p'
     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
+        with:
+          # We don't want to execute remotely, but instead execute tests locally when necessary.
+          only_cache: true
+
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        with:
+          detached: true
+
+      - uses: Vampire/setup-wsl@v4
+        with:
+          additional-packages: |
+            curl
+            ca-certificates
+            g++
+            unzip
+            zip
+            git
+            python3
+            tar
+          wsl-shell-command: bash --login -euo pipefail
+      - 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}
+      - name: Install node modules in WSL (re-using from previous install/cache restore)
+        run: yarn install --immutable
+        shell: wsl-bash {0}
+      - run: yarn ng-dev release build-env-stamp --mode=release
+        shell: wsl-bash {0}
       - 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"
+        shell: wsl-bash {0}
 
   e2e-package-managers:
     needs: build
@@ -161,7 +202,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(
@@ -74,7 +68,6 @@ NODE_18_REPO = {
     "18.19.1-linux_ppc64le": ("node-v18.19.1-linux-ppc64le.tar.xz", "node-v18.19.1-linux-ppc64le", "2e5812b8fc00548e2e8ab9daa88ace13974c16b6ba5595a7a50c35f848f7d432"),
     "18.19.1-linux_s390x": ("node-v18.19.1-linux-s390x.tar.xz", "node-v18.19.1-linux-s390x", "15106acf4c9e3aca02416dd89fb5c71af77097042455a73f9caa064c1988ead5"),
     "18.19.1-linux_amd64": ("node-v18.19.1-linux-x64.tar.xz", "node-v18.19.1-linux-x64", "f35f24edd4415cd609a2ebc03be03ed2cfe211d7333d55c752d831754fb849f0"),
-    "18.19.1-windows_amd64": ("node-v18.19.1-win-x64.zip", "node-v18.19.1-win-x64", "ff08f8fe253fba9274992d7052e9d9a70141342d7b36ddbd6e84cbe823e312c6"),
 }
 
 nodejs_register_toolchains(
@@ -102,7 +95,6 @@ nodejs_register_toolchains(
         "20.11.1-linux_ppc64le": ("node-v20.11.1-linux-ppc64le.tar.xz", "node-v20.11.1-linux-ppc64le", "51343cacf5cdf5c4b5e93e919d19dd373d6ef43d5f2c666eae299f26e31d08b5"),
         "20.11.1-linux_s390x": ("node-v20.11.1-linux-s390x.tar.xz", "node-v20.11.1-linux-s390x", "b32616b705cd0ddbb230b95c693e3d7a37becc2ced9bcadea8dc824cceed6be0"),
         "20.11.1-linux_amd64": ("node-v20.11.1-linux-x64.tar.xz", "node-v20.11.1-linux-x64", "d8dab549b09672b03356aa2257699f3de3b58c96e74eb26a8b495fbdc9cf6fbe"),
-        "20.11.1-windows_amd64": ("node-v20.11.1-win-x64.zip", "node-v20.11.1-win-x64", "bc032628d77d206ffa7f133518a6225a9c5d6d9210ead30d67e294ff37044bda"),
     },
     node_version = "20.11.1",
 )
@@ -117,7 +109,6 @@ nodejs_register_toolchains(
         "22.0.0-linux_ppc64le": ("node-v22.0.0-linux-ppc64le.tar.xz", "node-v22.0.0-linux-ppc64le", "2b3fb8707a79243bfb3131312b86716ddc3855bce21bb168095b6b916798e5e9"),
         "22.0.0-linux_s390x": ("node-v22.0.0-linux-s390x.tar.xz", "node-v22.0.0-linux-s390x", "89a8efeeb9f94ce9ea251b8109e079c14919f4c0dc2cbc9f545ec47ef0886737"),
         "22.0.0-linux_amd64": ("node-v22.0.0-linux-x64.tar.xz", "node-v22.0.0-linux-x64", "9122e50f2642afd5f6078cafd1f52ede60fc464284384f05c18a04d13d07ae5a"),
-        "22.0.0-windows_amd64": ("node-v22.0.0-win-x64.zip", "node-v22.0.0-win-x64", "32d639b47d4c0a651ff8f8d7d41a454168a3d4045be37985f9a810cf8cef6174"),
     },
     node_version = "22.0.0",
 )
@@ -164,7 +155,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 +220,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

@@ -1,4 +1,3 @@
-load("@aspect_bazel_lib//lib/private:tar_toolchain.bzl", "tar_toolchain")
 load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 load("//tools:defaults2.bzl", "js_binary")
 
@@ -25,18 +24,6 @@ js_binary(
     entry_point = "quicktype_runner.js",
 )
 
-tar_toolchain(
-    name = "system_tar_exec",
-    binary = "tar_system.bat",
-)
-
-toolchain(
-    name = "windows_tar_system_toolchain",
-    exec_compatible_with = ["@platforms//os:windows"],
-    toolchain = ":system_tar_exec",
-    toolchain_type = "@aspect_bazel_lib//lib:tar_toolchain_type",
-)
-
 # TODO(devversion): Improve this by potentially sharing this common block.
 copy_file(
     name = "copy_worker_js",