patch 8.2.2158: CI on cirrus times out, coveralls doesn't always run

Problem:    CI on cirrus times out, coveralls doesn't always run.
Solution:   Set timeout to 20 minutes. Adjust condition. (closes #7493)

diff --git a/.cirrus.yml b/.cirrus.yml
index a098789c59fead1a2717a6d9060d1175e90c8c7e..4d78085b8d4667424ed98681e2a8716ab0ea63dc 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -3,6 +3,8 @@ env:
   FEATURES: huge
 
 freebsd_12_task:
+  only_if: $CIRRUS_TAG == ''
+  timeout_in: 20m
   freebsd_instance:
     image: freebsd-12-1-release-amd64
   install_script:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b6dd144fbb18c6b1a179857673b82f15935d703e..25ac92f5dcc1cb3fd226f5d5d44a1a340b71f497 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -231,7 +231,7 @@ jobs:
     runs-on: ubuntu-latest
 
     needs: linux
-    if: github.event_name != 'pull_request'
+    if: always() && github.event_name != 'pull_request'
 
     steps:
       - name: Parallel finished

diff --git a/src/version.c b/src/version.c
index 70ff9a457e3205358745d7f3f81c86ce04889d56..96aa9b0043f2fa6dcaddef18e62419ef3af3f38c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2158,
 /**/
     2157,
 /**/