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 a098789..4d78085 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -3,6 +3,8 @@
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 b6dd144..25ac92f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -231,7 +231,7 @@
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 70ff9a4..96aa9b0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2158,
+/**/
2157,
/**/
2156,