From aa2bbaa31f3c213000a01679a93c968fd81c6c23 Mon Sep 17 00:00:00 2001 From: Aleos Date: Fri, 9 Dec 2022 14:53:25 -0500 Subject: [PATCH] Update GitHub workflows (#7477) * Updates gcc to work on Ubuntu 22.04. * Force clang to use Ubuntu 20.04 until some build errors are resolved in the environment. * Adds a concurrency check to disable any active prior runs when pushing a new commit. --- .github/workflows/build_servers_clang.yml | 8 ++++++-- .github/workflows/build_servers_cmake.yml | 6 +++++- .github/workflows/build_servers_gcc.yml | 8 ++++++-- .github/workflows/build_servers_modes.yml | 8 ++++++-- .github/workflows/build_servers_msbuild.yml | 4 ++++ .github/workflows/build_servers_packetversions.yml | 8 ++++++-- .github/workflows/build_servers_vip.yml | 8 ++++++-- .github/workflows/npc_db_validation.yml | 8 ++++++-- 8 files changed, 45 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_servers_clang.yml b/.github/workflows/build_servers_clang.yml index a53112f125..d07881dca0 100644 --- a/.github/workflows/build_servers_clang.yml +++ b/.github/workflows/build_servers_clang.yml @@ -1,6 +1,10 @@ name: Build servers with Clang # build_servers_clang.yml +concurrency: + group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + on: push: branches: @@ -22,9 +26,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # The ubuntu-latest label currently points to ubuntu-20.04. + # The ubuntu-latest label currently points to ubuntu-22.04. # Available: ubuntu-22.04, ubuntu-20.04 - os: [ubuntu-latest] + os: [ubuntu-20.04] # Version list can be found on https://github.com/marketplace/actions/install-clang clang: ['6.0', '7', '8', '9', '10', '11'] #, '12', '13'] diff --git a/.github/workflows/build_servers_cmake.yml b/.github/workflows/build_servers_cmake.yml index f5c41f0c93..528342191e 100644 --- a/.github/workflows/build_servers_cmake.yml +++ b/.github/workflows/build_servers_cmake.yml @@ -1,6 +1,10 @@ name: Build servers with CMake # build_servers_cmake.yml +concurrency: + group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + on: push: branches: @@ -22,7 +26,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # The ubuntu-latest label currently points to ubuntu-20.04. + # The ubuntu-latest label currently points to ubuntu-22.04. # Available: ubuntu-22.04, ubuntu-20.04 os: [ubuntu-latest] diff --git a/.github/workflows/build_servers_gcc.yml b/.github/workflows/build_servers_gcc.yml index 3cc4c17bc3..3e2af7074b 100644 --- a/.github/workflows/build_servers_gcc.yml +++ b/.github/workflows/build_servers_gcc.yml @@ -1,6 +1,10 @@ name: Build servers with GCC # build_servers_gcc.yml +concurrency: + group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + on: push: branches: @@ -22,11 +26,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # The ubuntu-latest label currently points to ubuntu-20.04. + # The ubuntu-latest label currently points to ubuntu-22.04. # Available: ubuntu-22.04, ubuntu-20.04 os: [ubuntu-latest] # Older versions of GCC are not available via unaltered aptitude repo lists. - gcc: ['7', '8', '9', '10'] + gcc: ['9', '10', '11'] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/build_servers_modes.yml b/.github/workflows/build_servers_modes.yml index a4af344a2c..61277ff091 100644 --- a/.github/workflows/build_servers_modes.yml +++ b/.github/workflows/build_servers_modes.yml @@ -1,6 +1,10 @@ name: Build servers in Pre-Renewal and Renewal # build_servers_modes.yml +concurrency: + group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + on: push: branches: @@ -22,11 +26,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # The ubuntu-latest label currently points to ubuntu-20.04. + # The ubuntu-latest label currently points to ubuntu-22.04. # Available: ubuntu-22.04, ubuntu-20.04 os: [ubuntu-latest] # Older versions of GCC are not available via unaltered aptitude repo lists. - gcc: ['10'] + gcc: ['11'] # We run build checks for both Renewal and PRE-Renewal mode: ['PRE','RE'] diff --git a/.github/workflows/build_servers_msbuild.yml b/.github/workflows/build_servers_msbuild.yml index fb22b5af2c..2856dd2757 100644 --- a/.github/workflows/build_servers_msbuild.yml +++ b/.github/workflows/build_servers_msbuild.yml @@ -1,6 +1,10 @@ name: Build servers with MSVS # build_servers_msbuild.yml +concurrency: + group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + on: push: branches: diff --git a/.github/workflows/build_servers_packetversions.yml b/.github/workflows/build_servers_packetversions.yml index 885f2fe363..998e945c6e 100644 --- a/.github/workflows/build_servers_packetversions.yml +++ b/.github/workflows/build_servers_packetversions.yml @@ -1,6 +1,10 @@ name: Build servers with different packet versions # build_servers_packetversions.yml +concurrency: + group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + on: push: branches: @@ -22,11 +26,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # The ubuntu-latest label currently points to ubuntu-20.04. + # The ubuntu-latest label currently points to ubuntu-22.04. # Available: ubuntu-22.04, ubuntu-20.04 os: [ubuntu-latest] # Older versions of GCC are not available via unaltered aptitude repo lists. - gcc: ['10'] + gcc: ['11'] # We run build checks for both Renewal and PRE-Renewal mode: ['PRE','RE'] # Check build success for different packet-versions diff --git a/.github/workflows/build_servers_vip.yml b/.github/workflows/build_servers_vip.yml index 3f6c9cb79f..f9d0455c52 100644 --- a/.github/workflows/build_servers_vip.yml +++ b/.github/workflows/build_servers_vip.yml @@ -1,6 +1,10 @@ name: Build servers in VIP mode # build_servers_vip.yml +concurrency: + group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + on: push: branches: @@ -22,11 +26,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # The ubuntu-latest label currently points to ubuntu-20.04. + # The ubuntu-latest label currently points to ubuntu-22.04. # Available: ubuntu-22.04, ubuntu-20.04 os: [ubuntu-latest] # Older versions of GCC are not available via unaltered aptitude repo lists. - gcc: ['10'] + gcc: ['11'] # We run build checks for both Renewal and PRE-Renewal mode: ['PRE', 'RE'] diff --git a/.github/workflows/npc_db_validation.yml b/.github/workflows/npc_db_validation.yml index 71ed924deb..89d06ad713 100644 --- a/.github/workflows/npc_db_validation.yml +++ b/.github/workflows/npc_db_validation.yml @@ -4,6 +4,10 @@ name: Validate NPC Scripts and DB Changes # For NPC and DB validation we only need two builds: one of Renewal and one for Pre-Renewal checks. # NPC scripts and database files are not platform dependent, so we can achieve this validation using only a simple linux setup. +concurrency: + group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + on: push: branches: @@ -25,11 +29,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # The ubuntu-latest label currently points to ubuntu-20.04. + # The ubuntu-latest label currently points to ubuntu-22.04. # Available: ubuntu-22.04, ubuntu-20.04 os: [ubuntu-latest] # Only a single version of GCC is required for validating NPC scripts and database changes. - gcc: ['10'] + gcc: ['11'] # We run build checks for both Renewal and PRE-Renewal mode: ['PRE', 'RE']