Bring latest changes here (#1759)

* CI: bump build and test timeouts to 60 minutes * Revert "Change skip network test name and comments" This reverts commit f85006a. Co-authored-by: Deirdre Connolly <[email protected]> Co-authored-by: teor <[email protected]>
ZcashFoundation · Feb 16, 2021 · 7fea9fc · 7fea9fc
1 parent 98e2f81
commit 7fea9fc
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
   test:
     name: Test (+${{ matrix.rust }}) on ${{ matrix.os }}
     # The large timeout is to accommodate Windows builds
-    timeout-minutes: 45
+    timeout-minutes: 60
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -34,11 +34,10 @@ jobs:
       - name: Install LLVM on Windows
         if: matrix.os == 'windows-latest'
         run: choco install llvm -y
-      - name: Run network tests only on macOS
-        # Only macOS runners have all network capabilities:
-        # https://docs.github.com/en/actions/reference/specifications-for-github-hosted-runners#cloud-hosts-for-github-hosted-runners
-        # Tests that only check launch behaviour or local port binding are not skipped in any platform.
-        if: matrix.os != 'macOS-latest'
+      - name: Skip network tests on Ubuntu and Windows
+        # Ubuntu runners don't have network or DNS configured during test steps
+        # Windows runners have an unreliable network
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'windows-latest'
         run: echo "ZEBRA_SKIP_NETWORK_TESTS=1" >> $GITHUB_ENV
       - name: Run tests
         env:
@@ -58,12 +57,12 @@ jobs:
 
   build-chain-no-features:
     name: Build (+${{ matrix.rust }}) zebra-chain w/o features on ubuntu-latest
-    timeout-minutes: 30
-    runs-on: ubuntu-latest    
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         rust: [stable, beta]
-    
+
     steps:
       - uses: actions/checkout@v1
       - uses: actions-rs/toolchain@v1
@@ -82,7 +81,7 @@ jobs:
 
   build:
     name: Build (+${{ matrix.rust }}) on ${{ matrix.os }}
-    timeout-minutes: 30
+    timeout-minutes: 60
     runs-on: ${{ matrix.os }}
     strategy:
       matrix: