Skip to content

Commit a45366e

Browse files
committed
Bump CI
1 parent a3f3663 commit a45366e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/opencv-rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
matrix:
1414
os-image:
1515
- ubuntu-22.04
16-
- macos-13
16+
- macos-14
1717
opencv-version:
1818
- 3.4.20
1919
- 4.10.0

ci/script.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ elif [[ "$os_family" == "Linux" ]]; then
5656
"$VCPKG_ROOT/vcpkg" list
5757
# fixes linking issue that started happening 2024-07-04
5858
export OPENCV_LINK_LIBS="+freetype"
59-
else
60-
if [[ "${OPENCV_LINKAGE:-dynamic}" == "static" ]]; then # static build
61-
export OPENCV_LINK_LIBS=opencv_gapi,opencv_highgui,opencv_objdetect,opencv_dnn,opencv_videostab,opencv_calib3d,opencv_features2d,opencv_stitching,opencv_flann,opencv_videoio,opencv_rgbd,opencv_aruco,opencv_video,opencv_ml,opencv_imgcodecs,opencv_imgproc,opencv_core,ade,ittnotify,liblibwebp,liblibtiff,liblibjpeg-turbo,liblibpng,liblibopenjp2,ippiw,ippicv,liblibprotobuf,quirc,zlib
62-
fi
59+
# else
60+
# if [[ "${OPENCV_LINKAGE:-dynamic}" == "static" ]]; then # static build
61+
# export OPENCV_LINK_LIBS=opencv_gapi,opencv_highgui,opencv_objdetect,opencv_dnn,opencv_videostab,opencv_calib3d,opencv_features2d,opencv_stitching,opencv_flann,opencv_videoio,opencv_rgbd,opencv_aruco,opencv_video,opencv_ml,opencv_imgcodecs,opencv_imgproc,opencv_core,ade,ittnotify,liblibwebp,liblibtiff,liblibjpeg-turbo,liblibpng,liblibopenjp2,ippiw,ippicv,liblibprotobuf,quirc,zlib
62+
# fi
6363
fi
6464
fi
6565

0 commit comments

Comments
 (0)