# HG changeset patch # User Bram Moolenaar # Date 1640431803 -3600 # Node ID 11383a35b497a02a0178ea40ea448fb88e3d9308 # Parent 95d06f5be51e4de7ace7f8f7cb9ca244f68f6904 patch 8.2.3891: github CI: workflows may overlap Commit: https://github.com/vim/vim/commit/7f4a628efefd893a3cad3a1fdde340c98360f705 Author: Yegappan Lakshmanan Date: Sat Dec 25 11:20:30 2021 +0000 patch 8.2.3891: github CI: workflows may overlap Problem: Github CI: workflows may overlap. Solution: Cancel previous workflows when starting a new one. (Yegappan Lakshmanan, closes #9400) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml --- 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 --- 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 --- 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,