sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4295 from mathisloge/ci/disable-debug-mode

Browse source 
[CI] disable vcpkg debug mode
This commit is contained in:
Artem Pavlenko 2022-02-08 14:09:55 +00:00 committed by GitHub
commit f3da900c35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ubuntu.yml vendored
View file

@ -89,7 +89,7 @@ jobs:
if: ${{ github.event_name == 'pull_request' || github.repository != 'mapnik/mapnik' }} if: ${{ github.event_name == 'pull_request' || github.repository != 'mapnik/mapnik' }}
shell: "bash" shell: "bash"
run: > run: >
`./vcpkg/vcpkg fetch nuget | tail -n 1` ${{ env.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1`
sources add sources add
-source "${{ inputs.NUGET_REGISTRY }}" -source "${{ inputs.NUGET_REGISTRY }}"
-storepasswordincleartext -storepasswordincleartext
@ -101,7 +101,7 @@ jobs:
if: ${{ github.event_name == 'pull_request' || github.repository != 'mapnik/mapnik' }} if: ${{ github.event_name == 'pull_request' || github.repository != 'mapnik/mapnik' }}
shell: "bash" shell: "bash"
run: > 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 }}" setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}"
- name: Configure CMake - name: Configure CMake

9
CMakePresets.json
View file

@ -191,8 +191,7 @@
], ],
"cacheVariables": { "cacheVariables": {
"INSTALL_DEPENDENCIES": "ON", "INSTALL_DEPENDENCIES": "ON",
"ADDITIONAL_LIBARIES_PATHS": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/bin", "ADDITIONAL_LIBARIES_PATHS": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/bin"
"VCPKG_INSTALL_OPTIONS": "--debug"
}, },
"environment": { "environment": {
"PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj4" "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj4"
@ -207,8 +206,7 @@
"ci-options" "ci-options"
], ],
"cacheVariables": { "cacheVariables": {
"CMAKE_CXX_FLAGS": "--coverage", "CMAKE_CXX_FLAGS": "--coverage"
"VCPKG_INSTALL_OPTIONS": "--debug"
}, },
"environment": { "environment": {
"PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj4" "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj4"
@ -224,8 +222,7 @@
"ci-options" "ci-options"
], ],
"cacheVariables": { "cacheVariables": {
"CMAKE_CXX_FLAGS": "-fprofile-arcs -ftest-coverage", "CMAKE_CXX_FLAGS": "-fprofile-arcs -ftest-coverage"
"VCPKG_INSTALL_OPTIONS": "--debug"
}, },
"environment": { "environment": {
"PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj4" "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj4"