File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -65,18 +65,21 @@ jobs:
65
65
os-image :
66
66
- ubuntu-24.04
67
67
- windows-2022
68
- - macos-14
69
68
vcpkg-version :
70
- - 2025.01 .13 # https://github.com/microsoft/vcpkg/releases
69
+ - 2025.06 .13 # https://github.com/microsoft/vcpkg/releases
71
70
vcpkg-features-cache-key :
72
71
- full
73
72
vcpkg-features :
74
73
- contrib,nonfree,ade,opencl
75
74
include :
76
75
- os-image : windows-2022
77
- vcpkg-version : 2025.01 .13
76
+ vcpkg-version : 2025.06 .13
78
77
vcpkg-features-cache-key : min
79
78
vcpkg-features : contrib
79
+ - os-image : macos-14
80
+ vcpkg-version : 2025.06.13
81
+ vcpkg-features-cache-key : full-no-opencl
82
+ vcpkg-features : contrib,nonfree,ade
80
83
runs-on : ${{ matrix.os-image }}
81
84
env :
82
85
VCPKG_VERSION : ${{ matrix.vcpkg-version }}
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ elif [[ "$os_family" == "macOS" ]]; then
31
31
" $ci_dir /install-macos-framework.sh"
32
32
fi
33
33
elif [[ " $os_family " == " Windows" ]]; then
34
- export CHOCO_LLVM_VERSION=20.1.0 # https://community.chocolatey.org/packages/llvm#versionhistory
34
+ export CHOCO_LLVM_VERSION=20.1.4 # https://community.chocolatey.org/packages/llvm#versionhistory
35
35
if [[ " ${VCPKG_VERSION:- } " != " " ]]; then # vcpkg build
36
36
" $ci_dir /install-windows-vcpkg.sh"
37
37
else # chocolatey build
You can’t perform that action at this time.
0 commit comments