ci: try simplify windows test preparation with bazel 7

WIP

Author: devversion

.github/workflows/pr.yml

@@ -127,6 +127,33 @@ jobs:
       - name: Run CLI E2E tests
         run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
+  e2e_windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-2025]
+        node: [22]
+        subset: [npm, esbuild]
+        shard: [0, 1, 2, 3, 4, 5]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Initialize environment
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@8ca74b8a897d28f4735043c745693a706ff5ca81
+      - name: Setup Bazel
+        uses: angular/dev-infra/github-actions/bazel/setup@8ca74b8a897d28f4735043c745693a706ff5ca81
+      - name: Setup Bazel RBE
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@8ca74b8a897d28f4735043c745693a706ff5ca81
+        with:
+          allow_windows_rbe: true
+          google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
+      - name: Run CLI E2E tests
+        uses: ./.github/shared-actions/windows-bazel-test
+        with:
+          test_target_name: e2e.${{ matrix.subset }}_node${{ matrix.node }}
+        env:
+          E2E_SHARD_TOTAL: 6
+          E2E_SHARD_INDEX: ${{ matrix.shard }}
+
   e2e-windows-subset:
     needs: build
     runs-on: windows-2025

scripts/windows-testing/convert-symlinks.mjs

@@ -26,8 +26,6 @@ const skipDirectories = [
   '_windows_amd64/bin/nodejs/node_modules',
 ];
 
-const workspaceRootPaths = [/.*\.runfiles\/_main\//, /^.*-fastbuild\/bin\//];
-
 // Copying can be parallelized and doesn't cause any WSL flakiness (no exe is invoked).
 const parallelCopyTasks = [];
 
@@ -51,58 +49,40 @@ async function transformDir(p) {
       // Allow for parallel processing of directory entries.
       tasks.push(
         (async () => {
-          let target = '';
+          let realTarget = '';
+          let linkTarget = '';
+
           try {
-            target = await fs.realpath(subPath);
+            realTarget = await fs.realpath(subPath);
+            linkTarget = await fs.readlink(subPath);
           } catch (e) {
             if (debug) {
-              console.error('Skipping', subPath);
+              console.error('Skipping; cannot dereference & read link', subPath);
             }
             return;
           }
 
           await fs.rm(subPath);
 
-          const subPathId = relativizeForSimilarWorkspacePaths(subPath);
-          const targetPathId = relativizeForSimilarWorkspacePaths(target);
-          const isSelfLink = subPathId === targetPathId;
-
-          // This is an actual file that needs to be copied. Copy contents.
-          //   - the target path is equivalent to the link. This is a self-link from `.runfiles` to `bin/`.
-          //   - the target path is outside any of our workspace roots.
-          if (isSelfLink || targetPathId.startsWith('..')) {
-            parallelCopyTasks.push(exec(`cp -Rf ${target} ${subPath}`));
+          // Transform relative links but preserve them.
+          // This is needed for pnpm.
+          if (!path.isAbsolute(linkTarget)) {
+            const wslSubPath = path.relative(rootDir, subPath).replace(/\//g, '\\');
+            const linkTargetWindowsPath = linkTarget.replace(/\//g, '\\');
+
+            if ((await fs.stat(realTarget)).isDirectory()) {
+              // This is a symlink to a directory, create a dir junction.
+              // Re-create this symlink on the Windows FS using the Windows mklink command.
+              await exec(`${cmdPath} /c mklink /d "${wslSubPath}" "${linkTargetWindowsPath}"`);
+            } else {
+              // This is a symlink to a file, create a file junction.
+              // Re-create this symlink on the Windows FS using the Windows mklink command.
+              await exec(`${cmdPath} /c mklink "${wslSubPath}" "${linkTargetWindowsPath}"`);
+            }
             return;
           }
 
-          const relativeSubPath = relativizeToRoot(subPath);
-          const targetAtDestination = path.relative(path.dirname(subPathId), targetPathId);
-          const targetAtDestinationWindowsPath = targetAtDestination.replace(/\//g, '\\');
-
-          const wslSubPath = relativeSubPath.replace(/\//g, '\\');
-
-          if (debug) {
-            console.log({
-              targetAtDestination,
-              subPath,
-              relativeSubPath,
-              target,
-              targetPathId,
-              subPathId,
-            });
-          }
-
-          if ((await fs.stat(target)).isDirectory()) {
-            // This is a symlink to a directory, create a dir junction.
-            // Re-create this symlink on the Windows FS using the Windows mklink command.
-            await exec(
-              `${cmdPath} /c mklink /d "${wslSubPath}" "${targetAtDestinationWindowsPath}"`,
-            );
-          } else {
-            // This is a symlink to a file, create a file junction.
-            // Re-create this symlink on the Windows FS using the Windows mklink command.
-            await exec(`${cmdPath} /c mklink "${wslSubPath}" "${targetAtDestinationWindowsPath}"`);
-          }
+          parallelCopyTasks.push(exec(`cp -Rf ${realTarget} ${subPath}`));
         })(),
       );
     } else if (file.isDirectory()) {
@@ -143,24 +123,6 @@ function exec(cmd, maxRetries = 2) {
   });
 }
 
-function relativizeForSimilarWorkspacePaths(p) {
-  const workspaceRootMatch = workspaceRootPaths.find((r) => r.test(p));
-  if (workspaceRootMatch !== undefined) {
-    return p.replace(workspaceRootMatch, '');
-  }
-
-  return path.relative(rootDir, p);
-}
-
-function relativizeToRoot(p) {
-  const res = path.relative(rootDir, p);
-  if (!res.startsWith('..')) {
-    return res;
-  }
-
-  throw new Error('Could not relativize to root: ' + p);
-}
-
 try {
   await transformDir(rootDir);
   await Promise.all(parallelCopyTasks);