From 70d729ecf8633af4e9c856eb6589f708aa28c835 Mon Sep 17 00:00:00 2001 From: Aleos Date: Tue, 20 Dec 2022 19:53:39 -0500 Subject: [PATCH] Fixes GitHub Workflow Concurrency flag (#7505) * Do not cancel master workflow. --- .github/workflows/analysis_codeql.yml | 2 +- .github/workflows/build_servers_clang.yml | 2 +- .github/workflows/build_servers_cmake.yml | 2 +- .github/workflows/build_servers_gcc.yml | 2 +- .github/workflows/build_servers_modes.yml | 2 +- .github/workflows/build_servers_msbuild.yml | 2 +- .github/workflows/build_servers_packetversions.yml | 2 +- .github/workflows/build_servers_vip.yml | 2 +- .github/workflows/npc_db_validation.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/analysis_codeql.yml b/.github/workflows/analysis_codeql.yml index c5a9ae7f19..20d12d2492 100644 --- a/.github/workflows/analysis_codeql.yml +++ b/.github/workflows/analysis_codeql.yml @@ -3,7 +3,7 @@ name: Analyse servers with CodeQL concurrency: group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} on: push: diff --git a/.github/workflows/build_servers_clang.yml b/.github/workflows/build_servers_clang.yml index d07881dca0..4917094a03 100644 --- a/.github/workflows/build_servers_clang.yml +++ b/.github/workflows/build_servers_clang.yml @@ -3,7 +3,7 @@ name: Build servers with Clang concurrency: group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} on: push: diff --git a/.github/workflows/build_servers_cmake.yml b/.github/workflows/build_servers_cmake.yml index 528342191e..e0a57e8e69 100644 --- a/.github/workflows/build_servers_cmake.yml +++ b/.github/workflows/build_servers_cmake.yml @@ -3,7 +3,7 @@ name: Build servers with CMake concurrency: group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} on: push: diff --git a/.github/workflows/build_servers_gcc.yml b/.github/workflows/build_servers_gcc.yml index 3e2af7074b..5876210065 100644 --- a/.github/workflows/build_servers_gcc.yml +++ b/.github/workflows/build_servers_gcc.yml @@ -3,7 +3,7 @@ name: Build servers with GCC concurrency: group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} on: push: diff --git a/.github/workflows/build_servers_modes.yml b/.github/workflows/build_servers_modes.yml index 61277ff091..b84ed68446 100644 --- a/.github/workflows/build_servers_modes.yml +++ b/.github/workflows/build_servers_modes.yml @@ -3,7 +3,7 @@ name: Build servers in Pre-Renewal and Renewal concurrency: group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} on: push: diff --git a/.github/workflows/build_servers_msbuild.yml b/.github/workflows/build_servers_msbuild.yml index 2856dd2757..6a003d22cc 100644 --- a/.github/workflows/build_servers_msbuild.yml +++ b/.github/workflows/build_servers_msbuild.yml @@ -3,7 +3,7 @@ name: Build servers with MSVS concurrency: group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} on: push: diff --git a/.github/workflows/build_servers_packetversions.yml b/.github/workflows/build_servers_packetversions.yml index 998e945c6e..b6450df4c3 100644 --- a/.github/workflows/build_servers_packetversions.yml +++ b/.github/workflows/build_servers_packetversions.yml @@ -3,7 +3,7 @@ name: Build servers with different packet versions concurrency: group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} on: push: diff --git a/.github/workflows/build_servers_vip.yml b/.github/workflows/build_servers_vip.yml index f9d0455c52..23a234bd9d 100644 --- a/.github/workflows/build_servers_vip.yml +++ b/.github/workflows/build_servers_vip.yml @@ -3,7 +3,7 @@ name: Build servers in VIP mode concurrency: group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} on: push: diff --git a/.github/workflows/npc_db_validation.yml b/.github/workflows/npc_db_validation.yml index 89d06ad713..131e6a4cbf 100644 --- a/.github/workflows/npc_db_validation.yml +++ b/.github/workflows/npc_db_validation.yml @@ -6,7 +6,7 @@ name: Validate NPC Scripts and DB Changes concurrency: group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} on: push: