Skip to content

Commit 5b45d70

Browse files
authored
Update vcpkg to 2025.01.13 (#3158)
1 parent 0a88a0f commit 5b45d70

File tree

3 files changed

+36
-4
lines changed

3 files changed

+36
-4
lines changed

.github/workflows/windows-ci.yml

+34-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,40 @@ jobs:
5151
run: |
5252
Write-Host "Changed file(s): ${{ steps.changed-files.outputs.windows_all_changed_files }}"
5353
54-
windows-build-and-test:
54+
windows-get-or-build-dependencies:
5555
if: needs.pre-job.outputs.should_skip != 'true'
5656
needs: pre-job
57+
runs-on: windows-2022
58+
steps:
59+
- run: |
60+
git config --system core.longpaths true
61+
62+
- uses: actions/checkout@v4
63+
with:
64+
submodules: recursive
65+
fetch-depth: 0
66+
67+
- uses: ilammy/msvc-dev-cmd@v1
68+
69+
- name: Export GitHub Actions cache environment variables
70+
uses: actions/github-script@v7
71+
with:
72+
script: |
73+
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
74+
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
75+
76+
- name: Acquire/Build Maplibre Native Core Dependencies
77+
env:
78+
CI: 1
79+
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
80+
timeout-minutes: 60
81+
run: |
82+
& ${{ github.workspace }}\platform\windows\Get-VendorPackages.ps1 -Triplet ${{ env.VSCMD_ARG_TGT_ARCH }}-windows -Renderer All
83+
84+
85+
windows-build-and-test:
86+
# if: needs.pre-job.outputs.should_skip != 'true'
87+
needs: windows-get-or-build-dependencies
5788
strategy:
5889
matrix:
5990
renderer: [opengl, egl, vulkan, osmesa]
@@ -98,12 +129,12 @@ jobs:
98129
env:
99130
CI: 1
100131
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
101-
VCPKG_KEEP_ENV_VARS: "CMAKE_CXX_COMPILER_LAUNCHER;CMAKE_C_COMPILER_LAUNCHER"
132+
# VCPKG_KEEP_ENV_VARS: "CMAKE_CXX_COMPILER_LAUNCHER;CMAKE_C_COMPILER_LAUNCHER"
102133
CMAKE_C_COMPILER_LAUNCHER: "${{ env.SCCACHE_PATH }}"
103134
CMAKE_CXX_COMPILER_LAUNCHER: "${{ env.SCCACHE_PATH }}"
104135
RENDERER: "${{ matrix.renderer }}"
105136
RENDERING_MODE: "${{ matrix.rendering_mode }}"
106-
timeout-minutes: 5
137+
timeout-minutes: 60
107138
run: |
108139
cmake --version
109140
& ${{ github.workspace }}\.github\scripts\windows-ci_configure_wrapper.ps1

platform/windows/Get-VendorPackages.ps1

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ switch($Renderer)
2525
'OSMesa' { $renderer_packages = @(); break }
2626
'OpenGL' { $renderer_packages = @('opengl-registry'); break }
2727
'Vulkan' { $renderer_packages = @(); break }
28+
'All' { $renderer_packages = @('egl', 'opengl-registry'); break }
2829
}
2930

3031
if(-not (Test-Path ('{0}\vcpkg.exe' -f $vcpkg_temp_dir)))

platform/windows/vendor/vcpkg

Submodule vcpkg updated 1745 files

0 commit comments

Comments
 (0)