diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2021-12-25 11:20:30 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-12-25 11:20:30 +0000 |
| commit | 7f4a628efefd893a3cad3a1fdde340c98360f705 (patch) | |
| tree | a16e10b261b02874ceb69907420194ccd4ad5677 | |
| parent | d787e40fdbe6f4d8bf47d36186c1d9d51c29b853 (diff) | |
patch 8.2.3891: github CI: workflows may overlapv8.2.3891
Problem: Github CI: workflows may overlap.
Solution: Cancel previous workflows when starting a new one. (Yegappan
Lakshmanan, closes #9400)
| -rw-r--r-- | .github/workflows/ci.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/codeql-analysis.yml | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1211bc0212..3c9459284d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,13 @@ on: branches: ['**'] pull_request: +# Cancels all previous workflow runs for pull requests that have not completed. +concurrency: + # The concurrency group contains the workflow name and the branch name for + # pull requests or the commit hash for any other events. + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }} + cancel-in-progress: true + jobs: linux: runs-on: ubuntu-18.04 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 482eb5c133..6ec3f420e2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -14,6 +14,13 @@ on: schedule: - cron: '0 18 * * 1' +# Cancels all previous workflow runs for pull requests that have not completed. +concurrency: + # The concurrency group contains the workflow name and the branch name for + # pull requests or the commit hash for any other events. + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }} + cancel-in-progress: true + jobs: analyze: name: Analyze diff --git a/src/version.c b/src/version.c index dd99a31d35..6d23fa8fc0 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 */ /**/ + 3891, +/**/ 3890, /**/ 3889, |