From 347484430683e94adfe9296041e65e970fa5bbbe Mon Sep 17 00:00:00 2001
From: Yves Delley <delleyves@gmx.ch>
Date: Tue, 12 Nov 2024 18:58:06 +0100
Subject: [PATCH] don't test Clang 19 just yet; fix cancel-in-progres

---
 .github/generate-job-matrix.py              |  2 +-
 .github/workflows/ci-clang-tidy.yml         | 16 ++++++++--------
 .github/workflows/ci-conan.yml              | 15 +++++++--------
 .github/workflows/ci-freestanding.yml       | 15 +++++++--------
 .github/workflows/ci-test-package-cmake.yml | 15 +++++++--------
 5 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/.github/generate-job-matrix.py b/.github/generate-job-matrix.py
index 9ba3b8f3f..ae06b9ce9 100644
--- a/.github/generate-job-matrix.py
+++ b/.github/generate-job-matrix.py
@@ -89,7 +89,7 @@ def make_msvc_config(release: str, version: int) -> Configuration:
     for c in [make_gcc_config(ver) for ver in [12, 13, 14]]
     + [
         make_clang_config(ver, platform)
-        for ver in [16, 17, 18, 19]
+        for ver in [16, 17, 18]
         for platform in ["x86-64", "arm64"]
     ]
     + [make_apple_clang_config(ver) for ver in [15]]
diff --git a/.github/workflows/ci-clang-tidy.yml b/.github/workflows/ci-clang-tidy.yml
index 402455a1b..9bbb7d8e0 100644
--- a/.github/workflows/ci-clang-tidy.yml
+++ b/.github/workflows/ci-clang-tidy.yml
@@ -34,20 +34,20 @@ on:
     paths-ignore:
       - "docs/**"
 
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
-  cancel-previous:
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
-      cancel-in-progress: true
-    runs-on: ubuntu-24.04
-    steps:
-      - run: echo "Cancelling all previous runs of ${{ github.workflow }}-${{ github.ref }}"
   generate-matrix:
     name: "Generate build matrix for ${{ github.workflow }}"
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     runs-on: ubuntu-24.04
-    needs: cancel-previous
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Set up Python
         uses: actions/setup-python@v5
diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
index f80f7776e..59479ab92 100644
--- a/.github/workflows/ci-conan.yml
+++ b/.github/workflows/ci-conan.yml
@@ -33,20 +33,19 @@ on:
 env:
   CHANNEL: ${{ fromJSON('["testing", "stable"]')[github.ref_type == 'tag' && startsWith(github.ref_name, 'v')] }}
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
-  cancel-previous:
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
-      cancel-in-progress: true
-    runs-on: ubuntu-24.04
-    steps:
-      - run: echo "Cancelling all previous runs of ${{ github.workflow }}-${{ github.ref }}"
   generate-matrix:
     name: "Generate build matrix for ${{ github.workflow }}"
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     runs-on: ubuntu-24.04
-    needs: cancel-previous
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Set up Python
         uses: actions/setup-python@v5
diff --git a/.github/workflows/ci-freestanding.yml b/.github/workflows/ci-freestanding.yml
index 2b2f97da0..8d5b0f9b6 100644
--- a/.github/workflows/ci-freestanding.yml
+++ b/.github/workflows/ci-freestanding.yml
@@ -34,20 +34,19 @@ on:
     paths-ignore:
       - "docs/**"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
-  cancel-previous:
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
-      cancel-in-progress: true
-    runs-on: ubuntu-24.04
-    steps:
-      - run: echo "Cancelling all previous runs of ${{ github.workflow }}-${{ github.ref }}"
   generate-matrix:
     name: "Generate build matrix for ${{ github.workflow }}"
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     runs-on: ubuntu-24.04
-    needs: cancel-previous
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Set up Python
         uses: actions/setup-python@v5
diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml
index bb1e96091..2eaf0e34c 100644
--- a/.github/workflows/ci-test-package-cmake.yml
+++ b/.github/workflows/ci-test-package-cmake.yml
@@ -38,20 +38,19 @@ on:
       - "example/**"
       - "test/**"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
-  cancel-previous:
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
-      cancel-in-progress: true
-    runs-on: ubuntu-24.04
-    steps:
-      - run: echo "Cancelling all previous runs of ${{ github.workflow }}-${{ github.ref }}"
   generate-matrix:
     name: "Generate build matrix for ${{ github.workflow }}"
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     runs-on: ubuntu-24.04
-    needs: cancel-previous
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Set up Python
         uses: actions/setup-python@v5