Skip to content

Commit 13ec4bb

Browse files
committed
build: use windows scripts for CI builds
Signed-off-by: deadprogram <ron@hybridgroup.com>
1 parent 7de3df9 commit 13ec4bb

1 file changed

Lines changed: 6 additions & 19 deletions

File tree

.github/workflows/windows.yml

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,15 @@ jobs:
2626
uses: actions/cache/restore@v4
2727
id: cache-opencv-source
2828
with:
29-
key: opencv-source-4130-windows-v1
29+
key: opencv-source-4130-windows-v3
3030
path: |
3131
./opencv/opencv-4.13.0
3232
./opencv/opencv_contrib-4.13.0
3333
- name: Download OpenCV source
3434
if: steps.cache-opencv-source.outputs.cache-hit != 'true'
35-
shell: bash
36-
run: |
37-
mkdir -p ./opencv
38-
curl -Lo ./opencv/opencv-4.13.0.zip https://github.com/opencv/opencv/archive/4.13.0.zip
39-
curl -Lo ./opencv/opencv_contrib-4.13.0.zip https://github.com/opencv/opencv_contrib/archive/4.13.0.zip
40-
- name: Extract OpenCV source
41-
if: steps.cache-opencv-source.outputs.cache-hit != 'true'
42-
shell: bash
35+
shell: cmd
4336
run: |
44-
cd ./opencv
45-
mkdir -p opencv-4.13.0
46-
mkdir -p opencv_contrib-4.13.0
47-
7z x opencv-4.13.0.zip
48-
7z x opencv_contrib-4.13.0.zip
37+
call .\win_download_opencv.cmd "${env:GITHUB_WORKSPACE}\opencv"
4938
- name: Save cached OpenCV source
5039
uses: actions/cache/save@v4
5140
if: steps.cache-opencv-source.outputs.cache-hit != 'true'
@@ -58,16 +47,14 @@ jobs:
5847
uses: actions/cache/restore@v4
5948
id: cache-opencv-build
6049
with:
61-
key: opencv-build-4130-windows-v1
50+
key: opencv-build-4130-windows-v3
6251
path: |
6352
./opencv/build
6453
- name: Build OpenCV
6554
if: steps.cache-opencv-build.outputs.cache-hit != 'true'
55+
shell: cmd
6656
run: |
67-
mkdir -p ./opencv/build
68-
cd ./opencv/build
69-
cmake -G "MinGW Makefiles" -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH="../opencv_contrib-4.13.0/modules" -DBUILD_SHARED_LIBS=ON -DWITH_IPP=OFF -DWITH_MSMF=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_wechat_qrcode=ON -DCPU_DISPATCH= -DOPENCV_GENERATE_PKGCONFIG=ON -DWITH_OPENCL_D3D11_NV=OFF -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int64_t -DOPENCV_ENABLE_NONFREE=ON -Wno-dev ../opencv-4.13.0
70-
cmake --build . --target install
57+
call .\win_build_opencv.cmd "${env:GITHUB_WORKSPACE}\opencv"
7158
- name: Save cached OpenCV build
7259
uses: actions/cache/save@v4
7360
if: steps.cache-opencv-build.outputs.cache-hit != 'true'

0 commit comments

Comments
 (0)