diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index deb6b1ef..2ca2be57 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -106,7 +106,7 @@ jobs: env: CTEST_OUTPUT_ON_FAILURE: 1 build-macos: - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v4 with: @@ -132,7 +132,7 @@ jobs: env: CTEST_OUTPUT_ON_FAILURE: 1 build-windows: - runs-on: windows-2022 + runs-on: windows-2025 steps: - uses: actions/checkout@v4 with: @@ -145,8 +145,8 @@ jobs: variant: sccache - name: Build run: | - cmake -S . -B build -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache - cmake --build build --parallel + cmake -S . -B build -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_BUILD_TYPE=Release + cmake --build build --parallel --config Release - name: Test run: | cd build @@ -269,7 +269,7 @@ jobs: - name: Verify library integrity run: | echo "### Library verification ###" - file build/bin/opencv_libs/libopencv_imgcodecs.so.4.9.0 | grep "shared object" + file build/bin/opencv_libs/libopencv_imgcodecs.so.4.12.0 | grep "shared object" - name: Run evaluation run: | diff --git a/3rdparty/opencv b/3rdparty/opencv index 2e3ccb4e..49486f61 160000 --- a/3rdparty/opencv +++ b/3rdparty/opencv @@ -1 +1 @@ -Subproject commit 2e3ccb4e8e098cf481c938998ff941e320fa4f85 +Subproject commit 49486f61fb25722cbcf586b7f4320921d46fb38e