# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1608306303 -3600
# Node ID b2660a8bbf363af8dbb7b85bb1193389d962a285
# Parent  ee10fbb1d6eddb00cb412a3322390b6c3d07fc7f
patch 8.2.2158: CI on cirrus times out, coveralls doesn't always run

Commit: https://github.com/vim/vim/commit/6e562fcc07c71ad1437c89c3d3cc423efb691f0a
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Dec 18 16:29:25 2020 +0100

    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 https://github.com/vim/vim/issues/7493)

diff --git a/.cirrus.yml b/.cirrus.yml
--- 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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2158,
+/**/
     2157,
 /**/
     2156,