Merge pull request #420 from bcorfman/lfsfix

Use git lfs install --skip repo + fix race cond in Node unit tests

Author: bcorfman

.github/workflows/ci-build-test.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: Ensure Git LFS assets are present
         run: |
-          git lfs install
+          git lfs install --skip-repo
           git lfs pull
           git lfs checkout
 
@@ -59,7 +59,7 @@ jobs:
 
       - name: Ensure Git LFS assets are present
         run: |
-          git lfs install
+          git lfs install --skip-repo
           git lfs pull
           git lfs checkout
 
@@ -87,7 +87,7 @@ jobs:
 
       - name: Ensure Git LFS assets are present
         run: |
-          git lfs install
+          git lfs install --skip-repo
           git lfs pull
           git lfs checkout
 
@@ -115,7 +115,7 @@ jobs:
 
       - name: Ensure Git LFS assets are present
         run: |
-          git lfs install
+          git lfs install --skip-repo
           git lfs pull
           git lfs checkout
 

.github/workflows/deploy-frontend-pages.yml

@@ -45,7 +45,7 @@ jobs:
 
       - name: Ensure Git LFS assets are present
         run: |
-          git lfs install
+          git lfs install --skip-repo
           git lfs pull
           git lfs checkout
 

.github/workflows/e2e-main.yml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Ensure Git LFS assets are present
         run: |
-          git lfs install
+          git lfs install --skip-repo
           git lfs pull
           git lfs checkout
 

scripts/e2e-external-webserver.cjs

@@ -67,6 +67,27 @@ async function waitForPort(host, port, timeoutMs) {
   throw new Error(`Timed out waiting for ${host}:${port}`);
 }
 
+async function waitForManagedServerReadiness({ host, port, timeoutMs, child, logDir }) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (child.exitCode != null || child.signalCode != null) {
+      throw createManagedServerError(
+        `Managed E2E web server exited before ready (code=${child.exitCode ?? 'null'}, signal=${child.signalCode ?? 'null'})`,
+        logDir,
+      );
+    }
+    if (await isPortOpen(host, port)) return;
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+  if (child.exitCode != null || child.signalCode != null) {
+    throw createManagedServerError(
+      `Managed E2E web server exited before ready (code=${child.exitCode ?? 'null'}, signal=${child.signalCode ?? 'null'})`,
+      logDir,
+    );
+  }
+  throw new Error(`Timed out waiting for ${host}:${port}`);
+}
+
 async function ensureCleanLogDir(logDir) {
   await fsp.rm(logDir, { recursive: true, force: true });
   await fsp.mkdir(logDir, { recursive: true });
@@ -199,7 +220,10 @@ async function startManagedExternalWebServer({
   });
 
   try {
-    await Promise.race([waitForPort(host, port, timeoutMs), unexpectedExit]);
+    await Promise.race([
+      waitForManagedServerReadiness({ host, port, timeoutMs, child, logDir }),
+      unexpectedExit,
+    ]);
   } catch (error) {
     cleanup();
     throw error;