From b08cfbc99fa4df3459db4e1ccf4263fd260e9b15 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Tue, 19 Dec 2023 16:14:33 +0000
Subject: [PATCH] ci/gha: review/fixup auto-cancel settings

- use the group expression from `reuse.yml` (via curl).
- add auto-cancel for `ci` and `cifuzz`.
- add auto-cancel to `appveyor_docker`. I'm just guessing here.
  The hope is that it fixes AppVeyor CI runs when re-pushing a PR.
  This frequently caused the freshly pushed session to fail waiting for
  a connection.
- sync group expression in `appveyor_status` with `reuse`.

Closes #1292
---
 .github/workflows/appveyor_docker.yml | 4 ++++
 .github/workflows/appveyor_status.yml | 2 +-
 .github/workflows/ci.yml              | 4 ++++
 .github/workflows/cifuzz.yml          | 4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/appveyor_docker.yml b/.github/workflows/appveyor_docker.yml
index 6729ce7b..c0e3ecf4 100644
--- a/.github/workflows/appveyor_docker.yml
+++ b/.github/workflows/appveyor_docker.yml
@@ -42,6 +42,10 @@ on:
       ssh_privkey:
         required: true
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 permissions: {}
 
 jobs:
diff --git a/.github/workflows/appveyor_status.yml b/.github/workflows/appveyor_status.yml
index 6718ba10..31fdc944 100644
--- a/.github/workflows/appveyor_status.yml
+++ b/.github/workflows/appveyor_status.yml
@@ -30,7 +30,7 @@ on:
   status
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.sha }}-${{ github.event.target_url }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 692780fc..b4c5e0cd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,10 @@ on:
   pull_request:
     branches: [master]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 permissions: {}
 
 jobs:
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 5fd23523..d0814b58 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -5,6 +5,10 @@
 name: CIFuzz
 on: [pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 permissions: {}
 
 jobs: