sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59569 from qgis/vcpkg-bump-baseline

Browse Source 
[vcpkg] Bump baseline
This commit is contained in:
Matthias Kuhn 2024-12-25 10:45:48 +01:00 committed by GitHub
commit af5edcb665
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/actions/setup-vcpkg/action.yml vendored
View File

@ -19,9 +19,7 @@ runs:
wget https://aka.ms/vcpkg-init.sh -O /tmp/vcpkg-init.sh
. /tmp/vcpkg-init.sh
echo "VCPKG_ROOT=$VCPKG_ROOT" >> $GITHUB_ENV
echo "PATH=$VCPKG_ROOT;$PATH" >> $GITHUB_ENV
# Integrate patch from https://github.com/microsoft/vcpkg/pull/41146
wget https://raw.githubusercontent.com/microsoft/vcpkg/6271c9bfab7ff6dbf3444c3600a28e7c6b0ea462/scripts/cmake/z_vcpkg_fixup_rpath_macho.cmake -O /Users/runner/.vcpkg/scripts/cmake/z_vcpkg_fixup_rpath_macho.cmake
echo "$VCPKG_ROOT" >> $GITHUB_PATH
- name: Setup vcpkg
if: runner.os == 'Windows'
@ -30,4 +28,4 @@ runs:
$env:VCPKG_ROOT = "C:/.vcpkg"
iex (iwr -useb https://aka.ms/vcpkg-init.ps1)
echo "VCPKG_ROOT=$env:VCPKG_ROOT" >> $env:GITHUB_ENV
echo "PATH=$env:VCPKG_ROOT;$env:PATH" >> $env:GITHUB_ENV
echo "$env:VCPKG_ROOT" >> $env:GITHUB_PATH

4
vcpkg/vcpkg.json
View File

@ -2,13 +2,13 @@
"vcpkg-configuration": {
"default-registry": {
"kind": "git",
"baseline": "41626fd77bf42f29e8f7e43dc1f2f05780588cde",
"baseline": "80d54ff62d528339c626a6fbc3489a7f25956ade",
"repository": "https://github.com/microsoft/vcpkg"
},
"registries": [
{
"kind": "git",
"baseline": "d842b9ba9f5a032fbfb459f68bc6c4a3510e1032",
"baseline": "a4bdac4fe806307844ddc5c663620ea919ffdf4c",
"repository": "https://github.com/open-vcpkg/python-registry",
"packages": [
"python3",