diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-18 16:29:25 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-18 16:29:25 +0100 |
| commit | 6e562fcc07c71ad1437c89c3d3cc423efb691f0a (patch) | |
| tree | 81b9d8d336b8ded4fedf5ab30127558353706dba | |
| parent | 9aed729fe9e62536236875a42fb170d2c8fb3046 (diff) | |
patch 8.2.2158: CI on cirrus times out, coveralls doesn't always runv8.2.2158
Problem: CI on cirrus times out, coveralls doesn't always run.
Solution: Set timeout to 20 minutes. Adjust condition. (closes #7493)
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index a098789c59..4d78085b8d 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 b6dd144fbb..25ac92f5dc 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 70ff9a457e..96aa9b0043 100644 --- 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, |