From 6e562fcc07c71ad1437c89c3d3cc423efb691f0a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 18 Dec 2020 16:29:25 +0100
Subject: [PATCH] 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)
---
 .cirrus.yml              | 2 ++
 .github/workflows/ci.yml | 2 +-
 src/version.c            | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index a098789c5..4d78085b8 100644
--- 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 b6dd144fb..25ac92f5d 100644
--- 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 70ff9a457..96aa9b004 100644
--- 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,
 /**/
-- 
2.40.0