From 47b4286c383ef9aab13e8fc26b26e848a51b5bf9 Mon Sep 17 00:00:00 2001 From: FantasqueX Date: Tue, 10 Dec 2024 00:34:35 +0800 Subject: [PATCH] Switch to FindPython3 --- .github/workflows/OCV-PR-5.x-ARM64-Debug.yaml | 2 +- .github/workflows/OCV-PR-5.x-ARM64.yaml | 2 +- .github/workflows/OCV-PR-5.x-U20-Cuda.yaml | 2 +- .github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml | 2 +- .github/workflows/OCV-PR-5.x-U20.yaml | 2 +- .github/workflows/OCV-PR-5.x-U22.yaml | 2 +- .github/workflows/OCV-PR-5.x-U24.yaml | 2 +- .github/workflows/OCV-PR-5.x-docs.yaml | 2 +- .github/workflows/OCV-PR-5.x-macOS-ARM64.yaml | 2 +- .github/workflows/OCV-PR-5.x-macOS-x86_64.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml b/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml index 074fa2ab..7e877e6b 100644 --- a/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml +++ b/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true env: - EXTRA_CMAKE_OPTIONS: '-DCV_DISABLE_OPTIMIZATION=ON -DCMAKE_BUILD_TYPE=Debug -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 -DOPENCV_DOWNLOAD_PATH=/home/ci/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON -DWITH_OPENCL=OFF' + EXTRA_CMAKE_OPTIONS: '-DCV_DISABLE_OPTIMIZATION=ON -DCMAKE_BUILD_TYPE=Debug -DOPENCV_DOWNLOAD_PATH=/home/ci/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON -DWITH_OPENCL=OFF' PR_AUTHOR: ${{ github.event.pull_request.user.login }} PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }} SOURCE_BRANCH_NAME: ${{ github.head_ref }} diff --git a/.github/workflows/OCV-PR-5.x-ARM64.yaml b/.github/workflows/OCV-PR-5.x-ARM64.yaml index c6838e29..55a9e9ab 100644 --- a/.github/workflows/OCV-PR-5.x-ARM64.yaml +++ b/.github/workflows/OCV-PR-5.x-ARM64.yaml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true env: - EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 -DOPENCV_DOWNLOAD_PATH=/home/ci/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON -DWITH_OPENCL=OFF' + EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DOPENCV_DOWNLOAD_PATH=/home/ci/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON -DWITH_OPENCL=OFF' PR_AUTHOR: ${{ github.event.pull_request.user.login }} PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }} SOURCE_BRANCH_NAME: ${{ github.head_ref }} diff --git a/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml b/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml index 82baad4a..0fef4edd 100644 --- a/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml +++ b/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true env: - EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 -DOPENCV_DOWNLOAD_PATH=/home/ci/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON -DWITH_CUDA=ON -DBUILD_LIST=dnn,cudev,ts -DCUDA_ARCH_BIN=6.1 -DWITH_VA=OFF' + EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DOPENCV_DOWNLOAD_PATH=/home/ci/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON -DWITH_CUDA=ON -DBUILD_LIST=dnn,cudev,ts -DCUDA_ARCH_BIN=6.1 -DWITH_VA=OFF' PR_AUTHOR: ${{ github.event.pull_request.user.login }} PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }} SOURCE_BRANCH_NAME: ${{ github.head_ref }} diff --git a/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml b/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml index e8e139d7..f4af04ed 100644 --- a/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml +++ b/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true env: - EXTRA_CMAKE_OPTIONS: '-DWITH_OPENVINO=ON -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 -DOPENCV_DOWNLOAD_PATH=/home/openvino/binaries_cache -DBUILD_EXAMPLES=ON ' + EXTRA_CMAKE_OPTIONS: '-DWITH_OPENVINO=ON -DOPENCV_DOWNLOAD_PATH=/home/openvino/binaries_cache -DBUILD_EXAMPLES=ON ' PR_AUTHOR: ${{ github.event.pull_request.user.login }} PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }} SOURCE_BRANCH_NAME: ${{ github.head_ref }} diff --git a/.github/workflows/OCV-PR-5.x-U20.yaml b/.github/workflows/OCV-PR-5.x-U20.yaml index 2116fae9..4a673322 100644 --- a/.github/workflows/OCV-PR-5.x-U20.yaml +++ b/.github/workflows/OCV-PR-5.x-U20.yaml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true env: - EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 -DOPENCV_DOWNLOAD_PATH=/home/ci/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON' + EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DOPENCV_DOWNLOAD_PATH=/home/ci/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON' PR_AUTHOR: ${{ github.event.pull_request.user.login }} PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }} SOURCE_BRANCH_NAME: ${{ github.head_ref }} diff --git a/.github/workflows/OCV-PR-5.x-U22.yaml b/.github/workflows/OCV-PR-5.x-U22.yaml index f8f87e89..144b41ec 100644 --- a/.github/workflows/OCV-PR-5.x-U22.yaml +++ b/.github/workflows/OCV-PR-5.x-U22.yaml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true env: - EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 -DOPENCV_DOWNLOAD_PATH=/home/ci/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON' + EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DOPENCV_DOWNLOAD_PATH=/home/ci/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON' PR_AUTHOR: ${{ github.event.pull_request.user.login }} PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }} SOURCE_BRANCH_NAME: ${{ github.head_ref }} diff --git a/.github/workflows/OCV-PR-5.x-U24.yaml b/.github/workflows/OCV-PR-5.x-U24.yaml index 62889535..02569517 100644 --- a/.github/workflows/OCV-PR-5.x-U24.yaml +++ b/.github/workflows/OCV-PR-5.x-U24.yaml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true env: - EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 -DOPENCV_DOWNLOAD_PATH=/home/ubuntu/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON -DWITH_JPEGXL=ON' + EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DOPENCV_DOWNLOAD_PATH=/home/ubuntu/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON -DWITH_JPEGXL=ON' PR_AUTHOR: ${{ github.event.pull_request.user.login }} PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }} SOURCE_BRANCH_NAME: ${{ github.head_ref }} diff --git a/.github/workflows/OCV-PR-5.x-docs.yaml b/.github/workflows/OCV-PR-5.x-docs.yaml index d334dde1..00f3706a 100644 --- a/.github/workflows/OCV-PR-5.x-docs.yaml +++ b/.github/workflows/OCV-PR-5.x-docs.yaml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true env: - EXTRA_CMAKE_OPTIONS: '-DOPENCV_ENABLE_NONFREE=ON -DBUILD_SHARED_LIBS=ON -DBUILD_DOCS=ON -DOPENCV_DOCS_HAVE_DOT=YES -DBUILD_TESTS=ON -DWITH_OPENNI2=ON -DWITH_GDCM=ON -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 -DOPENCV_EXTRA_MODULES_PATH=/home/ci/opencv_contrib/modules -DWITH_GDAL=ON -DBUILD_EXAMPLES=ON -DBUILD_PERF_TESTS=ON -DWITH_IPP=OFF' + EXTRA_CMAKE_OPTIONS: '-DOPENCV_ENABLE_NONFREE=ON -DBUILD_SHARED_LIBS=ON -DBUILD_DOCS=ON -DOPENCV_DOCS_HAVE_DOT=YES -DBUILD_TESTS=ON -DWITH_OPENNI2=ON -DWITH_GDCM=ON -DOPENCV_EXTRA_MODULES_PATH=/home/ci/opencv_contrib/modules -DWITH_GDAL=ON -DBUILD_EXAMPLES=ON -DBUILD_PERF_TESTS=ON -DWITH_IPP=OFF' PR_AUTHOR: ${{ github.event.pull_request.user.login }} PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }} SOURCE_BRANCH_NAME: ${{ github.head_ref }} diff --git a/.github/workflows/OCV-PR-5.x-macOS-ARM64.yaml b/.github/workflows/OCV-PR-5.x-macOS-ARM64.yaml index 7f8e5f46..671f1133 100644 --- a/.github/workflows/OCV-PR-5.x-macOS-ARM64.yaml +++ b/.github/workflows/OCV-PR-5.x-macOS-ARM64.yaml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true env: - EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 -DOPENCV_DOWNLOAD_PATH=$BINARIES_CACHE -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON -DBUILD_ZLIB=OFF -DWITH_OPENCL=OFF' + EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DOPENCV_DOWNLOAD_PATH=$BINARIES_CACHE -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON -DBUILD_ZLIB=OFF -DWITH_OPENCL=OFF' PR_AUTHOR: ${{ github.event.pull_request.user.login }} PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }} SOURCE_BRANCH_NAME: ${{ github.head_ref }} diff --git a/.github/workflows/OCV-PR-5.x-macOS-x86_64.yaml b/.github/workflows/OCV-PR-5.x-macOS-x86_64.yaml index d715a33a..d33a660d 100644 --- a/.github/workflows/OCV-PR-5.x-macOS-x86_64.yaml +++ b/.github/workflows/OCV-PR-5.x-macOS-x86_64.yaml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true env: - EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 -DOPENCV_DOWNLOAD_PATH=$BINARIES_CACHE -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON -DBUILD_ZLIB=OFF' + EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DOPENCV_DOWNLOAD_PATH=$BINARIES_CACHE -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON -DBUILD_ZLIB=OFF' PR_AUTHOR: ${{ github.event.pull_request.user.login }} PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }} SOURCE_BRANCH_NAME: ${{ github.head_ref }}