Bump CI

Author: twistedfall

.github/workflows/opencv-rust.yml

@@ -13,16 +13,21 @@ jobs:
       matrix:
         os-image:
           - ubuntu-22.04
-          - macos-13
+          - macos-14
         opencv-version:
-          - 3.4.20
           - 4.10.0
         linkage:
           - dynamic
         include:
           - os-image: ubuntu-22.04
             opencv-version: 4.10.0
             linkage: static
+          - os-image: ubuntu-22.04
+            opencv-version: 3.4.20
+            linkage: dynamic
+          - os-image: macos-13
+            opencv-version: 3.4.20
+            linkage: dynamic
     runs-on: ${{ matrix.os-image }}
     env:
       Atlas_ROOT_DIR: /usr/include/ # for cmake to find lapacke.h

ci/install-macos-framework.sh

@@ -26,4 +26,5 @@ fi
 python "$opencv_src/platforms/osx/build_framework.py" \
 	--contrib "$opencv_contrib_src" \
 	--enable_nonfree \
+	--macos_archs "$(uname -m)" \
 	"$build_dir"

ci/script.sh

@@ -56,11 +56,6 @@ elif [[ "$os_family" == "Linux" ]]; then
 		"$VCPKG_ROOT/vcpkg" list
 		# fixes linking issue that started happening since 2024-07-04
 		export OPENCV_LINK_LIBS="+freetype,bz2"
-	else
-		if [[ "${OPENCV_LINKAGE:-dynamic}" == "static" ]]; then # static build
-			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
-		fi
-	fi
 fi
 
 # remove tests and examples that require the latest OpenCV version so that they don't fail due to missing modules