Merge pull request VirtusLab#177 from alexarchambault/tweak-ci

Tweak CI
tpasternak · Oct 1, 2021 · 1ebc99d · 1ebc99d
2 parents e55d283 + d8aed24
commit 1ebc99d
Showing 1 changed file with 23 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,9 +8,13 @@ on:
   pull_request:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.head_ref }}
+  cancel-in-progress: true
+
 jobs:
   jvm-tests:
-    timeout-minutes: 80
+    timeout-minutes: 120
     runs-on: ${{ matrix.OS }}
     strategy:
       fail-fast: false
@@ -41,23 +45,8 @@ jobs:
     - name: JVM integration tests
       run: ./mill -i integration.jvm.test
 
-  docs-tests:
-    # for now, lets run those tests only on ubuntu
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-        submodules: true
-    - uses: coursier/cache-action@v6.3
-    - uses: coursier/setup-action@v1.1.1
-      with:
-        jvm: 8
-    - name: Test cookbooks
-      run: .github/scripts/check_docs.sh
-
   native-tests:
-    timeout-minutes: 80
+    timeout-minutes: 120
     runs-on: ${{ matrix.OS }}
     strategy:
       fail-fast: false
@@ -91,7 +80,7 @@ jobs:
         COURSIER_JNI: force
 
   native-mostly-static-tests:
-    timeout-minutes: 80
+    timeout-minutes: 120
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -131,7 +120,7 @@ jobs:
         docker push virtuslab/scala-cli:latest
 
   native-static-tests:
-    timeout-minutes: 80
+    timeout-minutes: 120
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -155,6 +144,21 @@ jobs:
     - name: Native integration tests
       run: ./mill -i integration.native-static.test
 
+  docs-tests:
+    # for now, lets run those tests only on ubuntu
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+        submodules: true
+    - uses: coursier/cache-action@v6.3
+    - uses: coursier/setup-action@v1.1.1
+      with:
+        jvm: 8
+    - name: Test cookbooks
+      run: .github/scripts/check_docs.sh
+
   checks:
     timeout-minutes: 15
     runs-on: ubuntu-latest