Skip to content

Commit 4d5923e

Browse files
committed
CI: upgrade vcpkg tag used for AppVeyor; use --triplet option
1 parent 700721e commit 4d5923e

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

.github/workflows/windows.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ jobs:
4646
shell: cmd
4747
if: steps.cache.outputs.cache-hit != 'true'
4848
run: |
49-
vcpkg install sqlite3[core,tool]:${{ env.ARCH }}-windows
50-
vcpkg install tiff:${{ env.ARCH }}-windows
51-
vcpkg install curl:${{ env.ARCH }}-windows
49+
vcpkg install sqlite3[core,tool] tiff curl --triplet=${{ env.ARCH }}-windows
5250
5351
- name: Build
5452
shell: cmd

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ build_script:
3131
# The checkout of a precise sha1 for VS2015 is a workaround for https://github.com/microsoft/vcpkg/issues/11666
3232
- if not exist %VCPKG_INSTALLED%\bin (
3333
cd "%VCPKG_ROOT%" &
34-
git fetch --depth=1 origin 2022.04.12 &
34+
git fetch --depth=1 origin 2023.04.15 &
3535
(if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (git -c advice.detachedHead=false checkout FETCH_HEAD)) &
3636
.\bootstrap-vcpkg.bat -disableMetrics &
37-
vcpkg install curl sqlite3[core,tool] tiff &
37+
vcpkg install sqlite3[core,tool] tiff curl --triplet=%platform%-windows &
3838
cd %APPVEYOR_BUILD_FOLDER%
3939
)
4040
- dir %VCPKG_INSTALLED%\bin

docs/source/install.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,8 @@ Install PROJ dependencies
400400

401401
::
402402

403-
vcpkg.exe install sqlite3[core,tool]:x86-windows tiff:x86-windows curl:x86-windows
404-
vcpkg.exe install sqlite3[core,tool]:x64-windows tiff:x64-windows curl:x64-windows
403+
vcpkg install sqlite3[core,tool] tiff curl --triplet=x86-windows
404+
vcpkg install sqlite3[core,tool] tiff curl --triplet=x64-windows
405405

406406
.. note:: The tiff and curl dependencies are only needed since PROJ 7.0
407407

0 commit comments

Comments
 (0)