[cairo-commit] 3 commits - .gitlab-ci.yml test/view-test-results.py

[GitLab Mirror]

 .gitlab-ci.yml            |    2 +-
 test/view-test-results.py |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 9fbf8f4859a0538dfdc4a4b243ced13df9d921b6
Merge: 5dafd7411 8f20ade80
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat May 28 23:13:17 2022 +0000

    Merge branch 'try-ports' into 'master'
    
    view-test-results.py: try up to 10 ports
    
    See merge request cairo/cairo!330

commit 8f20ade808ff6e78cc30c4cd8bce4970cb056081
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat May 28 17:37:04 2022 +0930

    autotools CI: build it faster

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 873e1bfdb..8e22d333f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,7 +102,7 @@ fedora autotools build:
   stage: 'build'
   script:
     - ./autogen.sh
-    - make V=1 VERBOSE=1
+    - make V=1 VERBOSE=1 -j $(nproc)
   artifacts:
     when: 'always'
     expire_in: '2 days'
commit 616c300cd30e2ab756a807b3b7084163212614d9
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat May 28 16:16:06 2022 +0930

    view-test-results.py: try up to 10 ports

diff --git a/test/view-test-results.py b/test/view-test-results.py
index 16241fec0..fbc0d7f88 100755
--- a/test/view-test-results.py
+++ b/test/view-test-results.py
@@ -7,7 +7,13 @@ import webbrowser
 
 port = 8000
 
-server = http.server.ThreadingHTTPServer(("localhost", port), http.server.SimpleHTTPRequestHandler)
+for i in range(10):
+    try:
+        server = http.server.ThreadingHTTPServer(("localhost", port), http.server.SimpleHTTPRequestHandler)
+        break
+    except OSError:
+        port += 1
+
 thread = threading.Thread(target = server.serve_forever)
 thread.daemon = True
 thread.start()