Fix sccache error in Windows-CI (#3405)
This commit is contained in:
11
.github/workflows/windows-ci.yml
vendored
11
.github/workflows/windows-ci.yml
vendored
@@ -38,6 +38,7 @@ jobs:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Get all Windows files that have changed
|
||||
if: github.event_name != 'workflow_dispatch'
|
||||
@@ -62,7 +63,6 @@ jobs:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
fetch-depth: 0
|
||||
|
||||
- uses: ilammy/msvc-dev-cmd@v1
|
||||
|
||||
@@ -75,9 +75,9 @@ jobs:
|
||||
|
||||
- name: Acquire/Build Maplibre Native Core Dependencies
|
||||
env:
|
||||
CI: 1
|
||||
CI: 1,
|
||||
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
|
||||
timeout-minutes: 60
|
||||
timeout-minutes: 120
|
||||
run: |
|
||||
& ${{ github.workspace }}\platform\windows\Get-VendorPackages.ps1 -Triplet ${{ env.VSCMD_ARG_TGT_ARCH }}-windows -Renderer All
|
||||
|
||||
@@ -112,7 +112,7 @@ jobs:
|
||||
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
|
||||
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
|
||||
|
||||
- uses: mozilla-actions/sccache-action@v0.0.8
|
||||
- uses: mozilla-actions/sccache-action@v0.0.9
|
||||
|
||||
- name: Initialize sccache
|
||||
run: |
|
||||
@@ -122,12 +122,13 @@ jobs:
|
||||
- name: Configure MapLibre Native Core
|
||||
env:
|
||||
CI: 1
|
||||
VCPKG_INSTALL_OPTIONS: "--debug"
|
||||
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
|
||||
# VCPKG_KEEP_ENV_VARS: "CMAKE_CXX_COMPILER_LAUNCHER;CMAKE_C_COMPILER_LAUNCHER"
|
||||
CMAKE_C_COMPILER_LAUNCHER: "${{ env.SCCACHE_PATH }}"
|
||||
CMAKE_CXX_COMPILER_LAUNCHER: "${{ env.SCCACHE_PATH }}"
|
||||
RENDERER: "${{ matrix.renderer }}"
|
||||
timeout-minutes: 60
|
||||
timeout-minutes: 120
|
||||
run: |
|
||||
cmake --version
|
||||
& ${{ github.workspace }}\.github\scripts\windows-ci_configure_wrapper.ps1
|
||||
|
||||
@@ -35,6 +35,7 @@ if(-not (Test-Path ('{0}\vcpkg.exe' -f $vcpkg_temp_dir)))
|
||||
|
||||
& ('{0}\vcpkg.exe' -f $vcpkg_temp_dir) $(
|
||||
@(
|
||||
'--debug',
|
||||
'--disable-metrics',
|
||||
('--overlay-triplets={0}' -f [System.IO.Path]::Combine($PWD.Path, 'vendor', 'vcpkg-custom-triplets')),
|
||||
('--triplet={0}' -f $Triplet),
|
||||
|
||||
2
platform/windows/vendor/vcpkg
vendored
2
platform/windows/vendor/vcpkg
vendored
Submodule platform/windows/vendor/vcpkg updated: db4924694e...ce613c4137
Reference in New Issue
Block a user