From 6be8fa2c731756d67b2718322828c52e37419a40 Mon Sep 17 00:00:00 2001
From: Patrick Lewis <pat@lo5t.com>
Date: Sun, 20 Jun 2021 04:09:42 -0700
Subject: [PATCH] fix(CI): workflow updates (#6439)

---
 .github/workflows/codestyle.yml          |  4 +++-
 .github/workflows/core_build.yml         |  2 +-
 .github/workflows/core_modules_build.yml |  4 ++--
 .github/workflows/docker_build.yml       | 12 +++++++-----
 .github/workflows/macos_build.yml        |  4 ++--
 .github/workflows/windows_build.yml      | 10 ++++++----
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml
index 3d1c5e33a..3dd61eb44 100644
--- a/.github/workflows/codestyle.yml
+++ b/.github/workflows/codestyle.yml
@@ -6,7 +6,9 @@ jobs:
   check-codestyle:
     strategy:
       fail-fast: false
-    runs-on: ubuntu-20.04
+      matrix:
+        os: [ubuntu-20.04]
+    runs-on: ${{ matrix.os }}
     name: check codestyle
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/core_build.yml b/.github/workflows/core_build.yml
index 980da6ebc..1599e7ae8 100644
--- a/.github/workflows/core_build.yml
+++ b/.github/workflows/core_build.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }})
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/core_modules_build.yml b/.github/workflows/core_modules_build.yml
index cbab54f22..1195d9063 100644
--- a/.github/workflows/core_modules_build.yml
+++ b/.github/workflows/core_modules_build.yml
@@ -6,11 +6,11 @@ on:
   pull_request:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }})
   cancel-in-progress: true
 
 jobs:
-  build:
+  build-modules:
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
index c4a670b6c..3e75e646a 100644
--- a/.github/workflows/docker_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -7,14 +7,16 @@ on:
     types: ['labeled']
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }})
   cancel-in-progress: true
 
 jobs:
   docker-build-n-deploy:
     strategy:
       fail-fast: true
-    runs-on: ubuntu-20.04
+      matrix:
+        os: [ubuntu-20.04]
+    runs-on: ${{ matrix.os }}
     if: github.repository == 'azerothcore/azerothcore-wotlk' && ${{ github.event.label.name == 'run-build' }}
     env:
       COMPOSE_DOCKER_CLI_BUILD: 1
@@ -76,10 +78,10 @@ jobs:
         uses: actions/cache@v2
         with:
           path: var/docker/ccache
-          key: ccache:ubuntu-20.04:clang:without-modules:${{ github.ref }}:${{ github.sha }}
+          key: ccache:${{ matrix.os }}:clang:without-modules:${{ github.ref }}:${{ github.sha }}
           restore-keys: |
-            ccache:ubuntu-20.04:clang:without-modules:${{ github.ref }}
-            ccache:ubuntu-20.04:clang:without-modules
+            ccache:${{ matrix.os }}:clang:without-modules:${{ github.ref }}
+            ccache:${{ matrix.os }}:clang:without-modules
 
       - name: Build Production images
         env:
diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml
index 56debbb1a..ec49855fa 100644
--- a/.github/workflows/macos_build.yml
+++ b/.github/workflows/macos_build.yml
@@ -7,7 +7,7 @@ on:
     types: ['labeled']
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }})
   cancel-in-progress: true
 
 jobs:
@@ -20,7 +20,7 @@ jobs:
  #         - macos-11.0
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }}
-    if: github.repository == 'azerothcore/azerothcore-wotlk && ${{ github.event.label.name == 'run-build' }}'
+    if: github.repository == 'azerothcore/azerothcore-wotlk' && ${{ github.event.label.name == 'run-build' }}
     steps:
       - uses: actions/checkout@v2
       - name: Cache
diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml
index 63cde91c8..9ceb99690 100644
--- a/.github/workflows/windows_build.yml
+++ b/.github/workflows/windows_build.yml
@@ -7,18 +7,20 @@ on:
     types: ['labeled']
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }})
   cancel-in-progress: true
 
 jobs:
   windows-build:
     strategy:
       fail-fast: false
-    runs-on: windows-2019
-    name: windows-2019-MSVC16
+      matrix:
+        os: [windows-2019]
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.os }}-MSVC16
     env:
       BOOST_ROOT: C:\local\boost_1_74_0
-    if: github.repository == 'azerothcore/azerothcore-wotlk && ${{ github.event.label.name == 'run-build' }}'
+    if: github.repository == 'azerothcore/azerothcore-wotlk' && ${{ github.event.label.name == 'run-build' }}
     steps:
       - uses: actions/checkout@v2
       - name: Configure OS