From 2fd0d2b0dde7d3ffb3caee9b6dbc329be2f7dbf1 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Tue, 5 Dec 2023 13:52:35 +0100 Subject: [PATCH] remove vcpkg step again --- .github/workflows/build-debian-11.yml | 5 +---- scripts/debian/2-configure.sh | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-debian-11.yml b/.github/workflows/build-debian-11.yml index c9a633b..26a5531 100644 --- a/.github/workflows/build-debian-11.yml +++ b/.github/workflows/build-debian-11.yml @@ -24,11 +24,8 @@ jobs: - name: Install Dependencies run: bash ./scripts/debian/1-install-deps.sh - - name: Setup vcpkg - uses: lukka/run-vcpkg@v11 - - name: Create Build Environment - run: bash ./scripts/debian/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake' + run: bash ./scripts/debian/2-configure.sh - name: Build Server run: bash ./scripts/debian/3-build.sh diff --git a/scripts/debian/2-configure.sh b/scripts/debian/2-configure.sh index 0c3edc1..4936f45 100755 --- a/scripts/debian/2-configure.sh +++ b/scripts/debian/2-configure.sh @@ -2,4 +2,4 @@ set -ex -cmake . -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 $1 +cmake . -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