Skip to content

Commit 7a2d4af

Browse files
committed
Bump vcpkg
1 parent 3d1dc47 commit 7a2d4af

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

.github/workflows/opencv-rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
- windows-2022
6868
- macos-14
6969
vcpkg-version:
70-
- 2024.04.26
70+
- 2024.06.15
7171
runs-on: ${{ matrix.os-image }}
7272
env:
7373
VCPKG_VERSION: ${{ matrix.vcpkg-version }}

ci/install-ubuntu-vcpkg.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ sudo apt-get install -y clang libharfbuzz0b git curl zip unzip tar bison gperf l
1616
sudo ln -fs libclang.so.1 /usr/lib/llvm-14/lib/libclang.so
1717

1818
export VCPKG_ROOT="$HOME/build/vcpkg"
19+
export VCPKG_DISABLE_METRICS=1
1920
if [[ -e "$VCPKG_ROOT" && ! -e "$VCPKG_ROOT/.git" ]]; then
2021
rm -rf "$VCPKG_ROOT"
2122
fi

ci/install-windows-vcpkg.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ rm -rf "$VCPKG_INSTALLATION_ROOT"
99
choco install -y llvm --version "$CHOCO_LLVM_VERSION"
1010

1111
export VCPKG_ROOT="$HOME/build/vcpkg"
12+
export VCPKG_DISABLE_METRICS=1
1213
if [[ -e "$VCPKG_ROOT" && ! -e "$VCPKG_ROOT/.git" ]]; then
1314
rm -rf "$VCPKG_ROOT"
1415
fi

ci/script.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ elif [[ "$OS_FAMILY" == "macOS" ]]; then
2424
export DYLD_FALLBACK_LIBRARY_PATH="$toolchain_path/usr/lib/"
2525
if [[ "${VCPKG_VERSION:-}" != "" ]]; then # vcpkg build
2626
export VCPKG_ROOT="$HOME/build/vcpkg"
27+
export VCPKG_DISABLE_METRICS=1
2728
echo "=== Installed vcpkg packages:"
2829
"$VCPKG_ROOT/vcpkg" list
2930
elif [[ "${BREW_OPENCV_VERSION:-}" != "" ]]; then # brew build

0 commit comments

Comments
 (0)