Bump CI

Author: twistedfall

.github/workflows/opencv-rust.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         os-image:
           - ubuntu-24.04
-          - macos-14
+          - macos-15
         opencv-version:
           - 4.11.0
         linkage:
@@ -30,7 +30,7 @@ jobs:
           - os-image: ubuntu-22.04
             opencv-version: 3.4.20
             linkage: dynamic
-          - os-image: macos-13
+          - os-image: macos-14
             opencv-version: 3.4.20
             linkage: dynamic
     runs-on: ${{ matrix.os-image }}
@@ -64,20 +64,20 @@ jobs:
       matrix:
         os-image:
           - ubuntu-24.04
-          - windows-2022
+          - windows-2025
         vcpkg-version:
-          - 2025.08.27 # https://github.com/microsoft/vcpkg/releases
+          - 2025.09.17 # https://github.com/microsoft/vcpkg/releases
         vcpkg-features-cache-key:
           - full
         vcpkg-features:
           - contrib,nonfree,ade,opencl
         include:
-          - os-image: windows-2022
-            vcpkg-version: 2025.08.27
+          - os-image: windows-2025
+            vcpkg-version: 2025.09.17
             vcpkg-features-cache-key: min
             vcpkg-features: contrib
-          - os-image: macos-14
-            vcpkg-version: 2025.08.27
+          - os-image: macos-15
+            vcpkg-version: 2025.09.17
             vcpkg-features-cache-key: full-no-opencl
             vcpkg-features: contrib,nonfree,ade
     runs-on: ${{ matrix.os-image }}
@@ -108,7 +108,7 @@ jobs:
       fail-fast: false
       matrix:
         os-image:
-          - windows-2022
+          - windows-2025
         version:
           - opencv: 3.4.16
           - opencv: 4.11.0 # https://community.chocolatey.org/packages/OpenCV#versionhistory
@@ -119,7 +119,7 @@ jobs:
           - os-image: ubuntu-22.04
             version:
               opencv: 4.5.4
-          - os-image: macos-14
+          - os-image: macos-15
             version:
               brew: "@4"
     runs-on: ${{ matrix.os-image }}

ci/install-macos-framework.sh

@@ -23,9 +23,15 @@ if [ ! -d "$opencv_contrib_src" ]; then
 	curl -L "https://github.com/opencv/opencv_contrib/archive/$OPENCV_VERSION.tar.gz" | tar -xz -C "$dist_dir"
 fi
 
-if [[ "$OPENCV_VERSION" == "3.4.20" ]]; then # old OpenCV doesn't support choosing archs
-	export CMAKE_POLICY_VERSION_MINIMUM=3.5
+if [[ "$OPENCV_VERSION" == "3.4.20" ]]; then
+	# old OpenCV doesn't support choosing archs, patch hardcoded value to be arm64
 	arch_arg=
+	script_dir="$(dirname "$(readlink -f "$0")")"
+	patch -p1 -d"$opencv_src" < "$script_dir/opencv-3.4-macos-arm64-build.patch"
+	# old OpenCV CMake min version requirement is too old for the newer CMake
+	export CMAKE_POLICY_VERSION_MINIMUM=3.5
+	# old OpenCV requires too old SDK for macOS 10.14
+	export MACOSX_DEPLOYMENT_TARGET=10.13
 else
 	arch_arg="--macos_archs $(uname -m)"
 fi

ci/opencv-3.4-macos-arm64-build.patch

@@ -0,0 +1,11 @@
+diff '--color=auto' -ur opencv-3.4.20.orig/platforms/osx/build_framework.py opencv-3.4.20/platforms/osx/build_framework.py
+--- opencv-3.4.20.orig/platforms/osx/build_framework.py	2023-06-27 13:29:13.000000000 +0200
++++ opencv-3.4.20/platforms/osx/build_framework.py	2025-10-03 11:25:30.786775436 +0200
+@@ -53,6 +53,6 @@
+ 
+     b = OSXBuilder(args.opencv, args.contrib, False, False, args.without, args.disable, args.enablenonfree,
+         [
+-            (["x86_64"], "MacOSX")
++            (["arm64"], "MacOSX")
+         ], args.debug, args.debug_info)
+     b.build(args.out)