Skip to content

Commit 6822f56

Browse files
committed
Bump versions in CI
1 parent 52d5738 commit 6822f56

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/opencv-rust.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,21 @@ jobs:
6565
os-image:
6666
- ubuntu-24.04
6767
- windows-2022
68-
- macos-14
6968
vcpkg-version:
70-
- 2025.01.13 # https://github.com/microsoft/vcpkg/releases
69+
- 2025.06.13 # https://github.com/microsoft/vcpkg/releases
7170
vcpkg-features-cache-key:
7271
- full
7372
vcpkg-features:
7473
- contrib,nonfree,ade,opencl
7574
include:
7675
- os-image: windows-2022
77-
vcpkg-version: 2025.01.13
76+
vcpkg-version: 2025.06.13
7877
vcpkg-features-cache-key: min
7978
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
8083
runs-on: ${{ matrix.os-image }}
8184
env:
8285
VCPKG_VERSION: ${{ matrix.vcpkg-version }}

ci/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ elif [[ "$os_family" == "macOS" ]]; then
3131
"$ci_dir/install-macos-framework.sh"
3232
fi
3333
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
3535
if [[ "${VCPKG_VERSION:-}" != "" ]]; then # vcpkg build
3636
"$ci_dir/install-windows-vcpkg.sh"
3737
else # chocolatey build

0 commit comments

Comments
 (0)