From 8ab018485b32faebab9443f48c5d4ee06f20fd30 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Tue, 5 Dec 2023 13:29:59 +0100 Subject: [PATCH] add back recursive fetch --- .github/workflows/build-debian-11.yml | 2 ++ scripts/debian/2-configure.sh | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/build-debian-11.yml b/.github/workflows/build-debian-11.yml index 6582ac6..29ba539 100644 --- a/.github/workflows/build-debian-11.yml +++ b/.github/workflows/build-debian-11.yml @@ -9,6 +9,8 @@ jobs: image: debian:11 steps: - uses: actions/checkout@v2 + with: + submodules: 'recursive' - name: Install Dependencies run: bash ./scripts/debian/1-install-deps.sh diff --git a/scripts/debian/2-configure.sh b/scripts/debian/2-configure.sh index f4cab6e..15ab28e 100755 --- a/scripts/debian/2-configure.sh +++ b/scripts/debian/2-configure.sh @@ -8,4 +8,10 @@ then git clone https://github.com/lionkor/commandline/ deps/commandline fi +if [ -ne ./deps/commandline/CMakeLists.txt ] +then + rm -rf deps/commandline + git clone https://github.com/microsoft/vcpkg/ deps/commandline +fi + cmake ${1:-.} -B bin -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -s -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON || cat "$SOURCE"/server/bin/vcpkg-bootstrap.log