From 7e8c2d2887ba06dbd79ca2bce11e325525e5ffb8 Mon Sep 17 00:00:00 2001 From: Yunfan Li Date: Thu, 12 Sep 2024 22:52:49 +0800 Subject: [PATCH] Fix continuous integration workflow --- .github/workflows/core-build-playerbots.yml | 6 +++--- .github/workflows/core-build.yml | 6 +++--- .github/workflows/macos_build.yml | 9 ++------- .github/workflows/windows_build.yml | 9 ++------- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/.github/workflows/core-build-playerbots.yml b/.github/workflows/core-build-playerbots.yml index 9d1ad73f1..7b7bf67bb 100644 --- a/.github/workflows/core-build-playerbots.yml +++ b/.github/workflows/core-build-playerbots.yml @@ -16,15 +16,15 @@ jobs: matrix: # the result of the matrix will be the combination of all attributes, so we get os*compiler builds include: - - os: ubuntu-20.04 + - os: ubuntu-22.04 c_compiler: clang cpp_compiler: clang++ build_type: Release - - os: ubuntu-20.04 + - os: ubuntu-22.04 c_compiler: gcc cpp_compiler: g++ build_type: Release - - os: ubuntu-latest + - os: ubuntu-24.04 c_compiler: gcc cpp_compiler: g++ build_type: Release diff --git a/.github/workflows/core-build.yml b/.github/workflows/core-build.yml index 4e2ed113a..5ead9c7da 100644 --- a/.github/workflows/core-build.yml +++ b/.github/workflows/core-build.yml @@ -16,15 +16,15 @@ jobs: matrix: # the result of the matrix will be the combination of all attributes, so we get os*compiler builds include: - - os: ubuntu-20.04 + - os: ubuntu-22.04 c_compiler: clang cpp_compiler: clang++ build_type: Release - - os: ubuntu-20.04 + - os: ubuntu-22.04 c_compiler: gcc cpp_compiler: g++ build_type: Release - - os: ubuntu-latest + - os: ubuntu-24.04 c_compiler: gcc cpp_compiler: g++ build_type: Release diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 2fb927004..a33ba9e8b 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -1,10 +1,9 @@ name: macos-build on: push: - branches: - - 'master' + branches: [ "Playerbot" ] pull_request: - types: ['labeled', 'opened', 'synchronize', 'reopened'] + branches: [ "Playerbot" ] concurrency: group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }}) @@ -19,10 +18,6 @@ jobs: - macos-12 runs-on: ${{ matrix.os }} name: ${{ matrix.os }} - if: | - github.repository == 'azerothcore/azerothcore-wotlk' - && !github.event.pull_request.draft - && (github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'run-build') || github.event.label.name == 'run-build') steps: - uses: actions/checkout@v4 - name: Cache diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index e10f68d02..84e069082 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -1,10 +1,9 @@ name: windows-build on: push: - branches: - - 'master' + branches: [ "Playerbot" ] pull_request: - types: ['labeled', 'opened', 'synchronize', 'reopened'] + branches: [ "Playerbot" ] concurrency: group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }}) @@ -20,10 +19,6 @@ jobs: name: ${{ matrix.os }} env: BOOST_ROOT: C:\local\boost_1_82_0 - if: | - github.repository == 'liyunfan1223/azerothcore-wotlk' - && !github.event.pull_request.draft - && (github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'run-build') || github.event.label.name == 'run-build') steps: - uses: actions/checkout@v4 - name: ccache