File tree Expand file tree Collapse file tree 2 files changed +16
-12
lines changed Expand file tree Collapse file tree 2 files changed +16
-12
lines changed Original file line number Diff line number Diff line change 15
15
matrix :
16
16
os-image :
17
17
- ubuntu-24.04
18
- - macos-14
18
+ - macos-15
19
19
opencv-version :
20
20
- 4.11.0
21
21
linkage :
30
30
- os-image : ubuntu-22.04
31
31
opencv-version : 3.4.20
32
32
linkage : dynamic
33
- - os-image : macos-13
33
+ - os-image : macos-14
34
34
opencv-version : 3.4.20
35
35
linkage : dynamic
36
36
runs-on : ${{ matrix.os-image }}
@@ -64,20 +64,20 @@ jobs:
64
64
matrix :
65
65
os-image :
66
66
- ubuntu-24.04
67
- - windows-2022
67
+ - windows-2025
68
68
vcpkg-version :
69
- - 2025.08.27 # https://github.com/microsoft/vcpkg/releases
69
+ - 2025.09.17 # https://github.com/microsoft/vcpkg/releases
70
70
vcpkg-features-cache-key :
71
71
- full
72
72
vcpkg-features :
73
73
- contrib,nonfree,ade,opencl
74
74
include :
75
- - os-image : windows-2022
76
- vcpkg-version : 2025.08.27
75
+ - os-image : windows-2025
76
+ vcpkg-version : 2025.09.17
77
77
vcpkg-features-cache-key : min
78
78
vcpkg-features : contrib
79
- - os-image : macos-14
80
- vcpkg-version : 2025.08.27
79
+ - os-image : macos-15
80
+ vcpkg-version : 2025.09.17
81
81
vcpkg-features-cache-key : full-no-opencl
82
82
vcpkg-features : contrib,nonfree,ade
83
83
runs-on : ${{ matrix.os-image }}
@@ -108,7 +108,7 @@ jobs:
108
108
fail-fast : false
109
109
matrix :
110
110
os-image :
111
- - windows-2022
111
+ - windows-2025
112
112
version :
113
113
- opencv : 3.4.16
114
114
- opencv : 4.11.0 # https://community.chocolatey.org/packages/OpenCV#versionhistory
@@ -119,7 +119,7 @@ jobs:
119
119
- os-image : ubuntu-22.04
120
120
version :
121
121
opencv : 4.5.4
122
- - os-image : macos-14
122
+ - os-image : macos-15
123
123
version :
124
124
brew : " @4"
125
125
runs-on : ${{ matrix.os-image }}
Original file line number Diff line number Diff line change @@ -23,9 +23,13 @@ if [ ! -d "$opencv_contrib_src" ]; then
23
23
curl -L " https://github.com/opencv/opencv_contrib/archive/$OPENCV_VERSION .tar.gz" | tar -xz -C " $dist_dir "
24
24
fi
25
25
26
- if [[ " $OPENCV_VERSION " == " 3.4.20" ]]; then # old OpenCV doesn't support choosing archs
27
- export CMAKE_POLICY_VERSION_MINIMUM=3.5
26
+ if [[ " $OPENCV_VERSION " == " 3.4.20" ]]; then
27
+ # old OpenCV doesn't support choosing archs
28
28
arch_arg=
29
+ # old OpenCV CMake min version requirement is too old for the newer CMake
30
+ export CMAKE_POLICY_VERSION_MINIMUM=3.5
31
+ # old OpenCV requires too old SDK for macOS 10.14
32
+ export MACOSX_DEPLOYMENT_TARGET=10.13
29
33
else
30
34
arch_arg=" --macos_archs $( uname -m) "
31
35
fi
You can’t perform that action at this time.
0 commit comments