Faff with CI config

.github/workflows/tests.yml

@@ -225,6 +225,10 @@ jobs:
         env:
           PREV_VERSION: "v0.99.4"
 
+        # If the server fails to start, we'll wait for GHA to cancel the job after 6 hours.
+        # Ensure we fail sooner than that to avoid clogging up GHA runners.
+        timeout-minutes: 30
+
       # Service containers to run with `container-job`
         services:
           synapse:

tests-e2e/run-tests.sh

@@ -15,13 +15,13 @@ until [ \
   "$(curl -s -w '%{http_code}' -o /dev/null "http://localhost:8844/idonotexist")" \
   -eq 404 ]
 do
-  ((attempts++))
   if [ "$attempts" -gt 60 ]; then
-    echo "Server did not start after $attempts seconds" > /dev/stderr
+    echo "Server did not start after $attempts seconds"
     exit 1
   fi
-  echo 'Waiting for server to start...'
+  echo "Waiting (total ${attempts}s) for server to start..."
   sleep 1
+  ((attempts++))
 done
 
 go test "$@"