Merge pull request cburstedde#161 from scivision/ci-timeout

CI timeout increase to avoid transient spurious failure
hannesbrandt · Jan 22, 2024 · a1f1e1f · a1f1e1f
2 parents adc81b2 + 23b596e
commit a1f1e1f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/ci_cmake.yml b/.github/workflows/ci_cmake.yml
@@ -22,7 +22,7 @@ jobs:
   linux:
     runs-on: ubuntu-22.04
     name: CMake build on Linux
-    timeout-minutes: 15
+    timeout-minutes: 60
 
     strategy:
       matrix:
@@ -92,16 +92,16 @@ jobs:
 
     - name: Upload package
       if: github.event.action == 'published'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: binary-archive
+        name: linux-binary-archive-${{ matrix.cc }}-${{ matrix.mpi }}-shared-${{ matrix.shared }}
         path: build/package
 
     - name: Upload log files
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: linux_cmake_log
+        name: linux_cmake_log-${{ matrix.cc }}-${{ matrix.mpi }}-shared-${{ matrix.shared }}
         path: |
           ./build/CMakeFiles/CMakeConfigureLog.yaml
           ./build/Testing/Temporary/LastTest.log
@@ -110,7 +110,7 @@ jobs:
     needs: linux
     runs-on: ubuntu-22.04
     name: CMake with Valgrind
-    timeout-minutes: 15
+    timeout-minutes: 60
 
     strategy:
       matrix:
@@ -143,7 +143,7 @@ jobs:
 
     - name: Upload log files
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linux_cmake_valgrind_log
         path: |
@@ -153,7 +153,7 @@ jobs:
   mac:
     runs-on: macos-latest
     name: CMake build on MacOS
-    timeout-minutes: 15
+    timeout-minutes: 60
 
     strategy:
       matrix:
@@ -198,24 +198,24 @@ jobs:
 
     - name: Upload package
       if: github.event.action == 'published'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: binary-archive
+        name: mac-binary-archive-${{ matrix.cc }}-shared-${{ matrix.shared }}
         path: build/package
 
     - name: Upload log files
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: mac_cmake_log
+        name: mac_cmake_log-${{ matrix.cc }}-shared-${{ matrix.shared }}
         path: |
           ./build/CMakeFiles/CMakeConfigureLog.yaml
           ./build/Testing/Temporary/LastTest.log
 
   windows:
     runs-on: windows-latest
     name: CMake build on Windows
-    timeout-minutes: 20
+    timeout-minutes: 60
 
     strategy:
       matrix:
@@ -253,14 +253,14 @@ jobs:
 
     - name: Upload package
       if: github.event.action == 'published'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: binary-archive
+        name: windows-binary-archive
         path: build/package
 
     - name: Upload log files
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: windows_cmake_log
         path: |

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -30,7 +30,7 @@
     "noTestsAction": "error",
     "scheduleRandom": true,
     "stopOnFailure": false,
-    "timeout": 30
+    "timeout": 60
   },
   "filter": {
     "exclude": {