From e188c8890d01af15224ab73af76fbef18c490fee Mon Sep 17 00:00:00 2001 From: Ferronn Date: Mon, 3 Feb 2025 18:28:39 +0000 Subject: [PATCH 1/8] drop vcpkg --- .gitmodules | 3 --- CMakeLists.txt | 4 ---- vcpkg | 1 - vcpkg.json | 10 ---------- 4 files changed, 18 deletions(-) delete mode 100644 .gitmodules delete mode 160000 vcpkg delete mode 100644 vcpkg.json diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index fe07c99..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vcpkg"] - path = vcpkg - url = https://github.com/microsoft/vcpkg diff --git a/CMakeLists.txt b/CMakeLists.txt index b9b57fd..89bbf36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(CMAKE_TOOLCHAIN_FILE - "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" - CACHE STRING "Vcpkg toolchain file") - option(BUILD_SHARED_LIBS "build library as shared" OFF) project(ctactless) diff --git a/vcpkg b/vcpkg deleted file mode 160000 index 0ca64b4..0000000 --- a/vcpkg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0ca64b4e1c70fa6d9f53b369b8f3f0843797c20c diff --git a/vcpkg.json b/vcpkg.json deleted file mode 100644 index 6f061a9..0000000 --- a/vcpkg.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", - "name": "ctactless", - "version": "0.0.1", - "dependencies": [ - "curl", - "openssl", - "zlib" - ] - } From 39181d0aad082e82f8a81b5b6c6736b25b4de9d7 Mon Sep 17 00:00:00 2001 From: Ferronn Date: Mon, 3 Feb 2025 18:39:19 +0000 Subject: [PATCH 2/8] add curl to gha --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ae5d9e..c7581e5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,6 +29,10 @@ jobs: - uses: actions/checkout@v4 with: submodules: true + - run: sudo apt-get install libcurl-openssl-dev + if: matrix.os == 'ubuntu-latest' + - run: choco install curl + if: matrix.os == 'windows-latest' - uses: seanmiddleditch/gha-setup-ninja@v6 - uses: pre-commit/action@v3.0.1 env: From eb7c23bff60043eae991adf1e5ab1e37faf169b3 Mon Sep 17 00:00:00 2001 From: Ferronn Date: Mon, 3 Feb 2025 18:41:02 +0000 Subject: [PATCH 3/8] fix linux curl --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c7581e5..ec8c0da 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: true - - run: sudo apt-get install libcurl-openssl-dev + - run: sudo apt-get install libcurl4-openssl-dev if: matrix.os == 'ubuntu-latest' - run: choco install curl if: matrix.os == 'windows-latest' From f7e9e1800afb41447f0298623e8cecde7857c1db Mon Sep 17 00:00:00 2001 From: Ferronn Date: Tue, 4 Feb 2025 16:07:07 +0000 Subject: [PATCH 4/8] bring back vcpkg.json --- .github/workflows/test.yml | 4 ---- vcpkg.json | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 vcpkg.json diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ec8c0da..6ae5d9e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,10 +29,6 @@ jobs: - uses: actions/checkout@v4 with: submodules: true - - run: sudo apt-get install libcurl4-openssl-dev - if: matrix.os == 'ubuntu-latest' - - run: choco install curl - if: matrix.os == 'windows-latest' - uses: seanmiddleditch/gha-setup-ninja@v6 - uses: pre-commit/action@v3.0.1 env: diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 0000000..6f061a9 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "name": "ctactless", + "version": "0.0.1", + "dependencies": [ + "curl", + "openssl", + "zlib" + ] + } From 75367bd0cf459683b3b95dffd73002ed07249c07 Mon Sep 17 00:00:00 2001 From: Ferronn Date: Tue, 4 Feb 2025 16:11:33 +0000 Subject: [PATCH 5/8] try lukka/run-vcpkg --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ae5d9e..3164e9c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,6 +30,7 @@ jobs: with: submodules: true - uses: seanmiddleditch/gha-setup-ninja@v6 + - uses: lukka/run-vcpkg@v11 - uses: pre-commit/action@v3.0.1 env: pythonLocation: ${{ matrix.os }} From a2b918ccb1be7d4f86e2c8f9e7ab09a89b027f03 Mon Sep 17 00:00:00 2001 From: Ferronn Date: Tue, 4 Feb 2025 16:21:08 +0000 Subject: [PATCH 6/8] try another way --- .github/workflows/test.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3164e9c..a20ea55 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,9 +30,11 @@ jobs: with: submodules: true - uses: seanmiddleditch/gha-setup-ninja@v6 - - uses: lukka/run-vcpkg@v11 - - uses: pre-commit/action@v3.0.1 - env: - pythonLocation: ${{ matrix.os }} - - run: cmake -B build -DBUILD_SHARED_LIBS=${{ matrix.shared }} + - run: vcpkg integrate install +# - uses: pre-commit/action@v3.0.1 +# env: +# pythonLocation: ${{ matrix.os }} + - run: cmake -B build \ + -DBUILD_SHARED_LIBS=${{ matrix.shared }} \ + -DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_INSTALLATION_ROOT }}scripts/buildsystems/vcpkg.cmake" - run: cmake --build build --verbose From ff7bb1d782c1eac8684f5ef25735c5164259a914 Mon Sep 17 00:00:00 2001 From: Ferronn Date: Tue, 4 Feb 2025 16:25:47 +0000 Subject: [PATCH 7/8] moo --- .github/workflows/test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a20ea55..035046d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,7 +34,5 @@ jobs: # - uses: pre-commit/action@v3.0.1 # env: # pythonLocation: ${{ matrix.os }} - - run: cmake -B build \ - -DBUILD_SHARED_LIBS=${{ matrix.shared }} \ - -DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_INSTALLATION_ROOT }}scripts/buildsystems/vcpkg.cmake" + - run: cmake -B build -DBUILD_SHARED_LIBS=${{ matrix.shared }} -DCMAKE_TOOLCHAIN_FILE="${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" - run: cmake --build build --verbose From 838e7e2e92532a3734914a512bf8dc68648b76ae Mon Sep 17 00:00:00 2001 From: Ferronn Date: Tue, 4 Feb 2025 16:31:08 +0000 Subject: [PATCH 8/8] try lukka again --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 035046d..f20134c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: with: submodules: true - uses: seanmiddleditch/gha-setup-ninja@v6 - - run: vcpkg integrate install + - uses: lukka/run-vcpkg@v11 # - uses: pre-commit/action@v3.0.1 # env: # pythonLocation: ${{ matrix.os }}