ddd

Author: alan-agius4

.github/shared-actions/windows-bazel-test/action.yml

@@ -18,7 +18,7 @@ runs:
   steps:
     - name: Initialize WSL
       id: init_wsl
-      uses: alan-agius4/dev-infra/github-actions/setup-wsl@58b931c5d78feb41e0987ada9287f919c8bb30fc
+      uses: alan-agius4/dev-infra/github-actions/setup-wsl@d404af1d5f346423421224953563d1e98e2b9fd3
       with:
         wsl_firewall_interface: 'vEthernet (WSL (Hyper-V firewall))'
 
@@ -32,7 +32,7 @@ runs:
       shell: wsl-bash {0}
 
     - name: Setup Bazel (inside WSL)
-      uses: alan-agius4/dev-infra/github-actions/bazel/setup@58b931c5d78feb41e0987ada9287f919c8bb30fc
+      uses: alan-agius4/dev-infra/github-actions/bazel/setup@d404af1d5f346423421224953563d1e98e2b9fd3
 
     - name: Setup Bazel RBE (inside WSL)
       uses: alan-agius4/dev-infra/github-actions/bazel/configure-remote@8d3488198613c56f4760efdf8e53d4700afd4af8

scripts/windows-testing/parallel-executor.mjs

@@ -14,38 +14,32 @@ const initialStatusRegex = /Running (\d+) tests/;
 
 async function main() {
   const [runfilesDir, targetName, testArgs] = process.argv.slice(2);
-  const maxShards = 1;
-
   const testEntrypoint = path.resolve(runfilesDir, '../', targetName);
   const testWorkingDir = path.resolve(runfilesDir, '_main');
   const tasks = [];
   const progress = {};
 
-  for (let i = 0; i < maxShards; i++) {
-    tasks.push(
-      spawnTest(
-        'bash',
-        [testEntrypoint, ...testArgs.split(' ').filter((arg) => arg !== '')],
-        {
-          cwd: testWorkingDir,
-          env: {
-            // Try to construct a pretty hermetic environment, as within Bazel.
-            PATH: process.env.PATH,
-            TEST_TOTAL_SHARDS: maxShards,
-            TEST_SHARD_INDEX: i,
-            E2E_SHARD_TOTAL: process.env.E2E_SHARD_TOTAL,
-            E2E_SHARD_INDEX: process.env.E2E_SHARD_INDEX,
-            FORCE_COLOR: '3',
-            // Needed by `rules_js`
-            BAZEL_BINDIR: '.',
-            // Needed to run the E2E in a different temp path.
-            E2E_TEMP: process.env.E2E_TEMP,
-          },
+  tasks.push(
+    spawnTest(
+      'bash',
+      [testEntrypoint, ...testArgs.split(' ').filter((arg) => arg !== '')],
+      {
+        cwd: testWorkingDir,
+        env: {
+          // Try to construct a pretty hermetic environment, as within Bazel.
+          PATH: process.env.PATH,
+          E2E_SHARD_TOTAL: process.env.E2E_SHARD_TOTAL,
+          E2E_SHARD_INDEX: process.env.E2E_SHARD_INDEX,
+          FORCE_COLOR: '3',
+          // Needed by `rules_js`
+          BAZEL_BINDIR: '.',
+          // Needed to run the E2E in a different temp path.
+          E2E_TEMP: process.env.E2E_TEMP,
         },
-        (s) => (progress[i] = s),
-      ),
-    );
-  }
+      },
+      (s) => (progress[0] = s),
+    ),
+  );
 
   const printUpdate = () => {
     console.error(`----`);

tests/legacy-cli/e2e_runner.ts

@@ -69,15 +69,12 @@ const parsed = parseArgs({
 const argv = {
   ...parsed.values,
   _: parsed.positionals,
-  'nb-shards':
-    parsed.values['nb-shards'] ??
-    (Number(process.env.E2E_SHARD_TOTAL ?? 1) * Number(process.env.TEST_TOTAL_SHARDS ?? 1) || 1),
+  'nb-shards': parsed.values['nb-shards'] ?? (Number(process.env.E2E_SHARD_TOTAL ?? 1) || 1),
   shard:
     parsed.values.shard ??
-    (process.env.E2E_SHARD_INDEX === undefined && process.env.TEST_SHARD_INDEX === undefined
+    (process.env.E2E_SHARD_INDEX === undefined
       ? undefined
-      : Number(process.env.E2E_SHARD_INDEX ?? 0) * Number(process.env.TEST_TOTAL_SHARDS ?? 1) +
-        Number(process.env.TEST_SHARD_INDEX ?? 0)),
+      : Number(process.env.E2E_SHARD_INDEX ?? 0)),
 };
 
 // Indicate sharding support for Bazel.