From 54afdaa101022445856c0925434e0cfb12dda2bc Mon Sep 17 00:00:00 2001
From: John Freeman <jfreeman08@gmail.com>
Date: Thu, 29 Jun 2023 17:31:36 -0500
Subject: [PATCH] ci: cancel overridden workflows (#4597)

Small quality-of-life improvements to workflows using new concurrency
control features:

https://docs.github.com/en/actions/using-jobs/using-concurrency

At time of this commit, macOS runners are oversubscribed. This may help.
---
 .github/workflows/doxygen.yml | 5 ++++-
 .github/workflows/macos.yml   | 5 ++++-
 .github/workflows/nix.yml     | 7 +++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml
index db98018753d..65515ea737f 100644
--- a/.github/workflows/doxygen.yml
+++ b/.github/workflows/doxygen.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - develop
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   job:
@@ -18,7 +21,7 @@ jobs:
           echo ${PATH} | tr ':' '\n'
           cmake --version
           doxygen --version
-          env
+          env | sort
       - name: build
         run: |
           mkdir build
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 94151bcf7eb..888ad6f7692 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -1,5 +1,8 @@
 name: macos
 on: [push, pull_request]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
 
@@ -29,7 +32,7 @@ jobs:
           python --version
           conan --version
           cmake --version
-          env
+          env | sort
       - name: build
         uses: ./.github/actions/build
         with:
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 706bdbe103b..4198369e78a 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -1,5 +1,8 @@
 name: nix
 on: [push, pull_request]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 # This workflow has two job matrixes.
 # They can be considered phases because the second matrix ("test")
@@ -57,7 +60,7 @@ jobs:
           echo ${PATH} | tr ':' '\n'
           conan --version
           cmake --version
-          env
+          env | sort
       - name: configure Conan
         env:
           CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
@@ -139,7 +142,7 @@ jobs:
           echo ${PATH} | tr ':' '\n'
           conan --version
           cmake --version
-          env
+          env | sort
           ls ~/.conan
       - name: checkout
         uses: actions/checkout@v3