From 8552e3e9d4cd8250c17da99d6b15ab3bf4efc20c Mon Sep 17 00:00:00 2001 From: Pysis Date: Fri, 10 Feb 2023 09:46:07 -0500 Subject: [PATCH 1/7] Organize workflow Deduplicate and summarize workflow file. --- .github/workflows/core_build.yml | 2 +- .github/workflows/core_windows_build.yml | 10 +++------- apps/ci/ci-compile.sh | 22 ++++++++++++---------- apps/ci/ci-packages.sh | 16 ++++++++++++++++ 4 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 apps/ci/ci-packages.sh diff --git a/.github/workflows/core_build.yml b/.github/workflows/core_build.yml index 15e28d09a..c6a488eb6 100644 --- a/.github/workflows/core_build.yml +++ b/.github/workflows/core_build.yml @@ -18,7 +18,7 @@ jobs: run: sudo apt-get update -y - name: Install Required Packages - run: sudo apt-get install -y git make cmake clang libssl-dev libbz2-dev build-essential default-libmysqlclient-dev libace-dev + run: ./apps/ci/ci-packages.sh - name: Update Compilers run: source ./apps/ci/ci-compiler-update.sh diff --git a/.github/workflows/core_windows_build.yml b/.github/workflows/core_windows_build.yml index 59b8a6dd6..b624e394f 100644 --- a/.github/workflows/core_windows_build.yml +++ b/.github/workflows/core_windows_build.yml @@ -21,12 +21,8 @@ jobs: - name: Checkout Submodules shell: bash - run: | - git submodule init && git submodule update - + run: apps/ci/ci-submodule-update.sh + - name: Build Project shell: bash - run: | - mkdir -p build && cd build - cmake .. -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 - cmake --build . --config Release --parallel 4 + run: .github/workflows/core_windows_build.yml diff --git a/apps/ci/ci-compile.sh b/apps/ci/ci-compile.sh index a8669e58c..36a031945 100644 --- a/apps/ci/ci-compile.sh +++ b/apps/ci/ci-compile.sh @@ -2,15 +2,17 @@ set -e -# Check for & make directories -time test -d _build || mkdir _build -time test -d _install || mkdir _install +mkdir -p build +cd build -# Move to build folder -time cd _build +cmake .. \ + -DBUILD_MANGOSD:BOOL=1 \ + -DBUILD_REALMD:BOOL=1 \ + -DBUILD_TOOLS:BOOL=1 \ + -DPLAYERBOTS:BOOL=1 \ + -DSCRIPT_LIB_ELUNA:BOOL=1 \ + -DSCRIPT_LIB_SD3:BOOL=1 \ + -DSOAP:BOOL=1 \ + -DUSE_STORMLIB:BOOL=1 -# Run CMake Configurations -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 - -# Compile the Project -time make -j 6 +cmake --build . --config Release --parallel 4 diff --git a/apps/ci/ci-packages.sh b/apps/ci/ci-packages.sh new file mode 100644 index 000000000..7ee3ac84c --- /dev/null +++ b/apps/ci/ci-packages.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set -e + +# Install Required Packages +sudo apt-get install -y \ + build-essential \ + clang \ + cmake \ + default-libmysqlclient-dev \ + git \ + libssl-dev \ + libbz2-dev \ + libace-dev \ + make \ +; From 9f575f882730cd64b2f22704d28a73a02151c08c Mon Sep 17 00:00:00 2001 From: Pysis Date: Thu, 1 Aug 2024 12:49:18 -0400 Subject: [PATCH 2/7] Make absent build directory --- apps/ci/ci-compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ci/ci-compile.sh b/apps/ci/ci-compile.sh index 36a031945..0949627f2 100644 --- a/apps/ci/ci-compile.sh +++ b/apps/ci/ci-compile.sh @@ -2,7 +2,7 @@ set -e -mkdir -p build +test -d build || mkdir build cd build cmake .. \ From 5980cb23a1371b1b20cab4258bdec19615269df0 Mon Sep 17 00:00:00 2001 From: Pysis Date: Thu, 1 Aug 2024 18:00:24 -0400 Subject: [PATCH 3/7] Manual Update SD3 Said up-to-date, not on a branch, had to `git pull origin master`. --- src/modules/SD3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/SD3 b/src/modules/SD3 index 951ed4f45..519bbc302 160000 --- a/src/modules/SD3 +++ b/src/modules/SD3 @@ -1 +1 @@ -Subproject commit 951ed4f456cbe2ad06ef9a432af14398ba78f62b +Subproject commit 519bbc302878681abf25685a4f0e7df5db560bc9 From a270f226afbfaff6e4158c7b1725b7c7d798eca5 Mon Sep 17 00:00:00 2001 From: Pysis Date: Wed, 28 Aug 2024 15:25:31 -0400 Subject: [PATCH 4/7] Update submodules - dep - Eluna - realmd - Extractor_projects Strange each was in a detached HEAD state with a lot of changes / absent items. Cleaned those / discarded all changes, then pulled for each directly because of that problem not allowing easy looping from git. Already current: - SD3 - win --- dep | 2 +- src/modules/Eluna | 2 +- src/realmd | 2 +- src/tools/Extractor_projects | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dep b/dep index ef8075ac6..c02243ee2 160000 --- a/dep +++ b/dep @@ -1 +1 @@ -Subproject commit ef8075ac6255435030e74e625c9f5170c12ca3cf +Subproject commit c02243ee29630c0d3b51f69d49589332927c9c0e diff --git a/src/modules/Eluna b/src/modules/Eluna index aae1917e2..5ca638f99 160000 --- a/src/modules/Eluna +++ b/src/modules/Eluna @@ -1 +1 @@ -Subproject commit aae1917e294d03134c0b4bdac0721ce079cdae40 +Subproject commit 5ca638f99fcd4a9f2cc94b42d0443ffa010618d0 diff --git a/src/realmd b/src/realmd index 2be26140b..e63d3a3bd 160000 --- a/src/realmd +++ b/src/realmd @@ -1 +1 @@ -Subproject commit 2be26140bf3b399259aa2398e2c3939e02a0dd7b +Subproject commit e63d3a3bd9f36497909e8e040a00055f205e7063 diff --git a/src/tools/Extractor_projects b/src/tools/Extractor_projects index b460e858e..1d533d5fe 160000 --- a/src/tools/Extractor_projects +++ b/src/tools/Extractor_projects @@ -1 +1 @@ -Subproject commit b460e858e9b878cada6fc9692b3b53fd3ea08169 +Subproject commit 1d533d5fec24fce8237e81d863f8270330363303 From 5cfe16889b6d590584c692b0cad8976033bed3f2 Mon Sep 17 00:00:00 2001 From: Pysis Date: Wed, 28 Aug 2024 17:38:16 -0400 Subject: [PATCH 5/7] Reverting submodule update For Eluna since it caused a `Hook.h` error. --- src/modules/Eluna | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/Eluna b/src/modules/Eluna index 5ca638f99..aae1917e2 160000 --- a/src/modules/Eluna +++ b/src/modules/Eluna @@ -1 +1 @@ -Subproject commit 5ca638f99fcd4a9f2cc94b42d0443ffa010618d0 +Subproject commit aae1917e294d03134c0b4bdac0721ce079cdae40 From 06d12e26613d9e29ff4fce9c09794490b60dc810 Mon Sep 17 00:00:00 2001 From: Pysis Date: Wed, 28 Aug 2024 18:00:39 -0400 Subject: [PATCH 6/7] Updates submodules to be consistent with master branch. --- src/modules/Eluna | 2 +- src/modules/SD3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/Eluna b/src/modules/Eluna index aae1917e2..058ffa1cb 160000 --- a/src/modules/Eluna +++ b/src/modules/Eluna @@ -1 +1 @@ -Subproject commit aae1917e294d03134c0b4bdac0721ce079cdae40 +Subproject commit 058ffa1cb7f81bb111e3022d572a6311558c1d5f diff --git a/src/modules/SD3 b/src/modules/SD3 index 519bbc302..443cd7a5f 160000 --- a/src/modules/SD3 +++ b/src/modules/SD3 @@ -1 +1 @@ -Subproject commit 519bbc302878681abf25685a4f0e7df5db560bc9 +Subproject commit 443cd7a5f701066cff624e3201f45de645f49cd2 From 1b5888efa5b7ce0287a24589ad8052b3de8b1de9 Mon Sep 17 00:00:00 2001 From: Pysis Date: Fri, 30 Aug 2024 00:49:06 -0400 Subject: [PATCH 7/7] Fix workflows Add `source` to package script invocation. Bring back commands for Windows build without script execution capability. --- .github/workflows/core_build.yml | 2 +- .github/workflows/core_windows_build.yml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/core_build.yml b/.github/workflows/core_build.yml index c6a488eb6..68a8c0e5f 100644 --- a/.github/workflows/core_build.yml +++ b/.github/workflows/core_build.yml @@ -18,7 +18,7 @@ jobs: run: sudo apt-get update -y - name: Install Required Packages - run: ./apps/ci/ci-packages.sh + run: source ./apps/ci/ci-packages.sh - name: Update Compilers run: source ./apps/ci/ci-compiler-update.sh diff --git a/.github/workflows/core_windows_build.yml b/.github/workflows/core_windows_build.yml index 8a41dc55f..89d8e5e99 100644 --- a/.github/workflows/core_windows_build.yml +++ b/.github/workflows/core_windows_build.yml @@ -26,8 +26,9 @@ jobs: - name: Checkout Submodules shell: bash - run: apps/ci/ci-submodule-update.sh - + run: | + git submodule init && git submodule update + - name: Build Project shell: bash run: |