Skip to content

Commit 80ca74e

Browse files
authored
Merge 06d12e2 into 4fd3912
2 parents 4fd3912 + 06d12e2 commit 80ca74e

File tree

4 files changed

+31
-14
lines changed

4 files changed

+31
-14
lines changed

.github/workflows/core_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
run: sudo apt-get update -y
1919

2020
- name: Install Required Packages
21-
run: sudo apt-get install -y git make cmake clang libssl-dev libbz2-dev build-essential default-libmysqlclient-dev libace-dev
21+
run: ./apps/ci/ci-packages.sh
2222

2323
- name: Update Compilers
2424
run: source ./apps/ci/ci-compiler-update.sh

.github/workflows/core_windows_build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ jobs:
2626

2727
- name: Checkout Submodules
2828
shell: bash
29-
run: |
30-
git submodule init && git submodule update
31-
29+
run: apps/ci/ci-submodule-update.sh
30+
3231
- name: Build Project
3332
shell: bash
3433
run: |

apps/ci/ci-compile.sh

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22

33
set -e
44

5-
# Check for & make directories
6-
time test -d _build || mkdir _build
7-
time test -d _install || mkdir _install
5+
test -d build || mkdir build
6+
cd build
87

9-
# Move to build folder
10-
time cd _build
8+
cmake .. \
9+
-DBUILD_MANGOSD:BOOL=1 \
10+
-DBUILD_REALMD:BOOL=1 \
11+
-DBUILD_TOOLS:BOOL=1 \
12+
-DPLAYERBOTS:BOOL=1 \
13+
-DSCRIPT_LIB_ELUNA:BOOL=1 \
14+
-DSCRIPT_LIB_SD3:BOOL=1 \
15+
-DSOAP:BOOL=1 \
16+
-DUSE_STORMLIB:BOOL=1
1117

12-
# Run CMake Configurations
13-
time cmake .. -DCMAKE_INSTALL_PREFIX=../_install -DBUILD_TOOLS:BOOL=1 -DBUILD_MANGOSD:BOOL=1 -DBUILD_REALMD:BOOL=1 -DSOAP:BOOL=1 -DSCRIPT_LIB_ELUNA:BOOL=1 -DSCRIPT_LIB_SD3:BOOL=1 -DPLAYERBOTS:BOOL=1 -DUSE_STORMLIB:BOOL=1
14-
15-
# Compile the Project
16-
time make -j 6
18+
cmake --build . --config Release --parallel 4

apps/ci/ci-packages.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
# Install Required Packages
6+
sudo apt-get install -y \
7+
build-essential \
8+
clang \
9+
cmake \
10+
default-libmysqlclient-dev \
11+
git \
12+
libssl-dev \
13+
libbz2-dev \
14+
libace-dev \
15+
make \
16+
;

0 commit comments

Comments
 (0)