From 854277e23fbfa90adf45c6059b5b0bf8064c09af Mon Sep 17 00:00:00 2001 From: PerdixOfMars Date: Tue, 31 Mar 2026 23:28:43 +0200 Subject: [PATCH 1/2] Delete fetch_system_dependencies.sh --- .ci/fetch_system_dependencies.sh | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100755 .ci/fetch_system_dependencies.sh diff --git a/.ci/fetch_system_dependencies.sh b/.ci/fetch_system_dependencies.sh deleted file mode 100755 index 76e6c98..0000000 --- a/.ci/fetch_system_dependencies.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -if [ -z ${EXTERNAL_ROOT+x} ]; then echo EXTERNAL_ROOT not set; exit 1; fi - -export EXTERNAL_BUILD_ROOT=$HOME/external_build - -mkdir "$EXTERNAL_BUILD_ROOT" || true - -# Install googletest dependency -if [ ! -f "$EXTERNAL_ROOT/include/gtest/gtest.h" ]; then - cd "$EXTERNAL_BUILD_ROOT"; - wget https://github.com/google/googletest/releases/download/v1.17.0/googletest-1.17.0.tar.gz; - tar -xzf googletest-1.17.0.tar.gz; - cd googletest-1.17.0; - cmake -DCMAKE_INSTALL_PREFIX="$EXTERNAL_ROOT" .; - make -j2 && make install; -fi From 8d80f4be8ea67ae0ac701df36a13c94a866c7e95 Mon Sep 17 00:00:00 2001 From: PerdixOfMars Date: Wed, 1 Apr 2026 08:32:16 +0200 Subject: [PATCH 2/2] Factor vcpkg out of CI scripts and into main stream --- .github/workflows/build.yml | 7 ++----- vcpkg-configuration.json | 7 +++++++ vcpkg.json | 11 +++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 vcpkg-configuration.json create mode 100644 vcpkg.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d65fae..b5551af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,14 +25,11 @@ jobs: - name: Setup vcpkg (with binary caching) uses: lukka/run-vcpkg@v11 with: - runVcpkgInstall: false + runVcpkgInstall: true + vcpkgJsonGlob: "${{ github.workspace }}/vcpkg.json" vcpkgDirectory: "${{ github.workspace }}/.vcpkg" vcpkgGitCommitId: "58950f88544e4637524dbd6a01d0317cf4cb77fc" - - name: Install dependencies - shell: bash - run: $VCPKG_ROOT/vcpkg install boost-asio boost-signals2 boost-smart-ptr gtest - - name: Create Build Environment run: cmake -E make_directory ${{runner.workspace}}/build diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json new file mode 100644 index 0000000..1991daf --- /dev/null +++ b/vcpkg-configuration.json @@ -0,0 +1,7 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json", + "default-registry": { + "kind": "builtin", + "baseline": "58950f88544e4637524dbd6a01d0317cf4cb77fc" + } +} diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 0000000..331f13b --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,11 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "name": "consolepp", + "version-string": "0.0.0", + "dependencies": [ + "boost-asio", + "boost-signals2", + "boost-smart-ptr", + "gtest" + ] +}