allow canceling concurrent builds on master for both desktop and docker

This commit is contained in:
ebbit1q 2026-04-10 18:59:29 +02:00
parent ff9ea1c240
commit 4fb4b8404c
2 changed files with 7 additions and 2 deletions

View file

@ -38,10 +38,10 @@ on:
- 'vcpkg.json' - 'vcpkg.json'
- 'vcpkg' - 'vcpkg'
# Cancel earlier, unfinished runs of this workflow on the same branch (unless on master) # Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
concurrency: concurrency:
group: "${{ github.workflow }} @ ${{ github.ref_name }}" group: "${{ github.workflow }} @ ${{ github.ref_name }}"
cancel-in-progress: ${{ github.ref_name != 'master' }} cancel-in-progress: ${{ github.ref_type != 'tag' }}
jobs: jobs:
configure: configure:

View file

@ -13,6 +13,11 @@ on:
- '.github/workflows/docker-release.yml' - '.github/workflows/docker-release.yml'
- 'Dockerfile' - 'Dockerfile'
# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
concurrency:
group: "${{ github.workflow }} @ ${{ github.ref_name }}"
cancel-in-progress: ${{ github.ref_type != 'tag' }}
jobs: jobs:
docker: docker:
name: amd64 & arm64 name: amd64 & arm64