Mercurial > vim

changeset 23225:b2660a8bbf36 v8.2.2158

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <Bram@vim.org>
date Fri, 18 Dec 2020 16:45:03 +0100
parents ee10fbb1d6ed
children e915f61040ec
files .cirrus.yml .github/workflows/ci.yml src/version.c
diffstat 3 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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:
--- 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
--- 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,