CI time!

stripe · Jun 21, 2021 · 300df71 · 300df71
1 parent 621b8ea
commit 300df71
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -66,15 +66,15 @@ jobs:
       fail-fast: false
       matrix:
         env:
-          - AUTOLOAD=0
+          # - AUTOLOAD=0
           - AUTOLOAD=1
         php-version:
-          - "5.6"
-          - "7.0"
-          - "7.1"
-          - "7.2"
+          # - "5.6"
+          # - "7.0"
+          # - "7.1"
+          # - "7.2"
           - "7.3"
-          - "7.4"
+          # - "7.4"
 
     steps:
       - uses: actions/checkout@master

diff --git a/tests/TestServer.php b/tests/TestServer.php
@@ -76,6 +76,7 @@ public function startTestServer($code)
             throw new \Exception("Error starting test server on pid {$pid}, command failed: {$command}");
         }
 
+        // Todo: should this time out?
         while ($r = \fgets($this->serverStderr)) {
             if (\str_contains($r, 'started')) {
                 break;
@@ -106,7 +107,8 @@ public function stopTestServer()
                 ++$n;
             }
         }
-        while (true) {
+
+        for ($i = 0; $i < 20; $i++) {
             $status = \proc_get_status($this->serverProc);
             if (!$status['running']) {
                 break;
@@ -120,6 +122,11 @@ public function stopTestServer()
             \exec("kill {$pid}");
             \usleep(100000);
         }
+
+        if ($status['running']) {
+          throw new Exception("Could not kill test server");
+        }
+
         // echo "Terminated test server on pid $pid\n";
         \fclose($this->serverStderr);
         \proc_close($this->serverProc);