mirror of
https://github.com/liyunfan1223/azerothcore-wotlk.git
synced 2026-08-04 13:57:52 +00:00
Merge remote-tracking branch 'upstream/master' into test-staging
# Conflicts: # .github/workflows/core-build-nopch.yml # .github/workflows/core-build-pch.yml # .github/workflows/macos_build.yml # .github/workflows/windows_build.yml # src/server/game/DataStores/DBCStores.cpp # src/server/game/Guilds/Guild.h # src/server/game/Scripting/ScriptDefines/DatabaseScript.cpp # src/server/game/Server/WorldSession.h
This commit is contained in:
21
.github/workflows/windows_build.yml
vendored
21
.github/workflows/windows_build.yml
vendored
@@ -7,6 +7,14 @@ on:
|
||||
branches: [ "Playerbot", "test-staging" ]
|
||||
|
||||
concurrency:
|
||||
# One concurrency group per workflow + ref.
|
||||
#
|
||||
# - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
|
||||
# in-progress runs for the same PR.
|
||||
# - A merge does NOT cancel the PR's own runs: this group is keyed on
|
||||
# refs/pull/<N>/merge and the master push on refs/heads/master, so they
|
||||
# never share a group. See the cancel-pr-runs-on-close workflow.
|
||||
# - Branch pushes are isolated by ref.
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
@@ -22,28 +30,22 @@ jobs:
|
||||
BOOST_ROOT: C:\local\boost_1_87_0
|
||||
steps:
|
||||
- name: Checkout AzerothCore
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v7
|
||||
|
||||
- name: Checkout Playerbot Module
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
repository: mod-playerbots/mod-playerbots
|
||||
ref: ${{ github.ref_name == 'Playerbot' && 'master' || 'test-staging' }}
|
||||
path: modules/mod-playerbots
|
||||
|
||||
- name: Move repo to short path
|
||||
shell: bash
|
||||
run: |
|
||||
mkdir C:/ac
|
||||
cp -r . C:/ac/
|
||||
|
||||
- name: ccache
|
||||
uses: hendrikmuhs/ccache-action@v1.2.13
|
||||
# Cache the fetched Boost + MySQL client so we don't re-download ~350 MB
|
||||
# and re-run the Boost installer on every run. The Test-Path guards in
|
||||
# "Configure OS" short-circuit the install work when these are restored.
|
||||
- name: Cache Boost & MySQL
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v6
|
||||
with:
|
||||
path: |
|
||||
C:\local\boost_1_87_0
|
||||
@@ -109,6 +111,5 @@ jobs:
|
||||
- name: Build
|
||||
shell: bash
|
||||
run: |
|
||||
cd C:/ac
|
||||
export CTOOLS_BUILD=all
|
||||
./acore.sh compiler build
|
||||
Reference in New Issue
Block a user