From 01f414de59405cc7ce5f677745dedf97e4f825ce Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 8 Feb 2022 14:54:40 +0100 Subject: [PATCH 1/2] [CI] disable vcpkg debug mode --- CMakePresets.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 32f7353a8..46720854c 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -191,8 +191,7 @@ ], "cacheVariables": { "INSTALL_DEPENDENCIES": "ON", - "ADDITIONAL_LIBARIES_PATHS": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/bin", - "VCPKG_INSTALL_OPTIONS": "--debug" + "ADDITIONAL_LIBARIES_PATHS": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/bin" }, "environment": { "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj4" @@ -207,8 +206,7 @@ "ci-options" ], "cacheVariables": { - "CMAKE_CXX_FLAGS": "--coverage", - "VCPKG_INSTALL_OPTIONS": "--debug" + "CMAKE_CXX_FLAGS": "--coverage" }, "environment": { "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj4" @@ -224,8 +222,7 @@ "ci-options" ], "cacheVariables": { - "CMAKE_CXX_FLAGS": "-fprofile-arcs -ftest-coverage", - "VCPKG_INSTALL_OPTIONS": "--debug" + "CMAKE_CXX_FLAGS": "-fprofile-arcs -ftest-coverage" }, "environment": { "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj4" From 0769303075ae9e493ee1ab847bd9bdea419b811f Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 8 Feb 2022 14:59:43 +0100 Subject: [PATCH 2/2] [CI] ubuntu: run with mono --- .github/workflows/ubuntu.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 4784ab5ff..6f17ccdfb 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -89,7 +89,7 @@ jobs: if: ${{ github.event_name == 'pull_request' || github.repository != 'mapnik/mapnik' }} shell: "bash" run: > - `./vcpkg/vcpkg fetch nuget | tail -n 1` + ${{ env.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1` sources add -source "${{ inputs.NUGET_REGISTRY }}" -storepasswordincleartext @@ -101,7 +101,7 @@ jobs: if: ${{ github.event_name == 'pull_request' || github.repository != 'mapnik/mapnik' }} shell: "bash" run: > - `./vcpkg/vcpkg fetch nuget | tail -n 1` + ${{ env.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1` setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}" - name: Configure CMake