From a0cc605f872dbdd8bacbf91e6fa53e1a51a553e5 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 3 Dec 2024 10:58:10 +0300 Subject: [PATCH 01/10] Dependencies update and hack for NodeJS 16. --- .github/workflows/build_wheels_linux.yml | 4 ++-- .github/workflows/build_wheels_linux_arm.yml | 2 +- docker/manylinux2014/Dockerfile_aarch64 | 14 ++++++++------ docker/manylinux2014/Dockerfile_x86_64 | 14 ++++++++------ 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index 746395e4..fc52b91f 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -41,7 +41,7 @@ jobs: MB_ML_VER: 2014 TRAVIS_BUILD_DIR: ${{ github.workspace }} CONFIG_PATH: travis_config.sh - DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20240524 + DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20241202 USE_CCACHE: 0 UNICODE_WIDTH: 32 PLAT: x86_64 @@ -139,7 +139,7 @@ jobs: NP_TEST_DEP: numpy==1.19.4 TRAVIS_BUILD_DIR: ${{ github.workspace }} CONFIG_PATH: travis_config.sh - DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20240524 + DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20241202 USE_CCACHE: 1 UNICODE_WIDTH: 32 SDIST: ${{ matrix.build_sdist || 0 }} diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml index 928ded7d..17a5e38d 100644 --- a/.github/workflows/build_wheels_linux_arm.yml +++ b/.github/workflows/build_wheels_linux_arm.yml @@ -42,7 +42,7 @@ jobs: MB_ML_VER: 2014 TRAVIS_BUILD_DIR: ${{ github.workspace }} CONFIG_PATH: travis_config.sh - DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20240524 + DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20241202 USE_CCACHE: 0 UNICODE_WIDTH: 32 SDIST: ${{ matrix.build_sdist || 0 }} diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64 index e19492ff..36c3bbed 100644 --- a/docker/manylinux2014/Dockerfile_aarch64 +++ b/docker/manylinux2014/Dockerfile_aarch64 @@ -1,16 +1,16 @@ -# Version: 20240524 +# Version: 20241202 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64 FROM quay.io/pypa/manylinux2014_aarch64:latest ARG CCACHE_VERSION=3.7.9 -ARG FFMPEG_VERSION=5.1.4 -ARG FREETYPE_VERSION=2.13.2 -ARG LIBPNG_VERSION=1.6.43 -ARG VPX_VERSION=v1.14.0 +ARG FFMPEG_VERSION=5.1.6 +ARG FREETYPE_VERSION=2.13.3 +ARG LIBPNG_VERSION=1.6.44 +ARG VPX_VERSION=v1.15.0 ARG NASM_VERSION=2.15.04 ARG OPENSSL_VERSION=1_1_1w -ARG QT_VERSION=5.15.13 +ARG QT_VERSION=5.15.16 ARG YASM_VERSION=1.3.0 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH @@ -141,3 +141,5 @@ RUN git config --global --add safe.directory /io ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/ffmpeg_build/lib/pkgconfig ENV LDFLAGS -L/ffmpeg_build/lib ENV PATH "$HOME/bin:$PATH" +# forces NodeJS 16 for Github actions, see https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/ +ENV ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64 index eceae25e..bb60a369 100644 --- a/docker/manylinux2014/Dockerfile_x86_64 +++ b/docker/manylinux2014/Dockerfile_x86_64 @@ -1,16 +1,16 @@ -# Version: 20240524 +# Version: 20241202 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64 FROM quay.io/pypa/manylinux2014_x86_64:latest ARG CCACHE_VERSION=3.7.9 -ARG FFMPEG_VERSION=5.1.4 -ARG FREETYPE_VERSION=2.13.2 -ARG LIBPNG_VERSION=1.6.43 -ARG VPX_VERSION=v1.14.0 +ARG FFMPEG_VERSION=5.1.6 +ARG FREETYPE_VERSION=2.13.3 +ARG LIBPNG_VERSION=1.6.44 +ARG VPX_VERSION=v1.15.0 ARG NASM_VERSION=2.15.04 ARG OPENSSL_VERSION=1_1_1w -ARG QT_VERSION=5.15.13 +ARG QT_VERSION=5.15.16 ARG YASM_VERSION=1.3.0 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH @@ -140,3 +140,5 @@ RUN git config --global --add safe.directory /io ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/ffmpeg_build/lib/pkgconfig ENV LDFLAGS -L/ffmpeg_build/lib ENV PATH "$HOME/bin:$PATH" +# forces NodeJS 16 for Github actions, see https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/ +ENV ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true From fbe0cf4329f521012d408c0c08c491cfe2eb4c13 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 3 Dec 2024 11:20:33 +0300 Subject: [PATCH 02/10] Add NodeJS 16 variables to pipeline too. --- .github/workflows/build_wheels_linux.yml | 3 +++ .github/workflows/build_wheels_linux_arm.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index fc52b91f..2b6805c6 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -34,6 +34,7 @@ jobs: build_sdist: [0] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true REPO_DIR: . PROJECT_SPEC: opencv-python MB_PYTHON_VERSION: ${{ matrix.python-version }} @@ -91,6 +92,7 @@ jobs: build_sdist: [0] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true MB_PYTHON_VERSION: ${{ matrix.python-version }} NP_TEST_DEP: numpy==1.19.4 NP_TEST_DEP_LATEST: numpy==2.0.0 @@ -130,6 +132,7 @@ jobs: build_sdist: [1] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true REPO_DIR: . PROJECT_SPEC: opencv-python PLAT: x86_64 diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml index 17a5e38d..e66bb0ce 100644 --- a/.github/workflows/build_wheels_linux_arm.yml +++ b/.github/workflows/build_wheels_linux_arm.yml @@ -34,6 +34,7 @@ jobs: build_sdist: [0] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true REPO_DIR: . PROJECT_SPEC: opencv-python MB_PYTHON_VERSION: ${{ matrix.python-version }} @@ -91,6 +92,7 @@ jobs: build_sdist: [0] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true MB_PYTHON_VERSION: ${{ matrix.python-version }} PLAT: aarch64 NP_TEST_DEP: numpy==1.19.4 From b705028ed6799a64cb9bf6a98fe1c275949b1140 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 3 Dec 2024 12:57:58 +0300 Subject: [PATCH 03/10] Use command line git to checkout repo instead of actions step. --- .github/workflows/build_wheels_linux.yml | 18 +++--------------- .github/workflows/build_wheels_linux_arm.yml | 12 ++---------- opencv | 2 +- opencv_contrib | 2 +- opencv_extra | 2 +- 5 files changed, 8 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index 2b6805c6..be662865 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -34,7 +34,6 @@ jobs: build_sdist: [0] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true REPO_DIR: . PROJECT_SPEC: opencv-python MB_PYTHON_VERSION: ${{ matrix.python-version }} @@ -59,10 +58,7 @@ jobs: echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi - name: Checkout - uses: actions/checkout@v3 - with: - submodules: false - fetch-depth: 0 + run: git clone --depth 1 -b ${{ env.SOURCE_BRANCH_NAME }} - name: Build a package run: source scripts/build.sh - name: Saving all wheels @@ -92,7 +88,6 @@ jobs: build_sdist: [0] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true MB_PYTHON_VERSION: ${{ matrix.python-version }} NP_TEST_DEP: numpy==1.19.4 NP_TEST_DEP_LATEST: numpy==2.0.0 @@ -103,10 +98,7 @@ jobs: run: find . -mindepth 1 -delete working-directory: ${{ github.workspace }} - name: Checkout - uses: actions/checkout@v3 - with: - submodules: true - fetch-depth: 0 + run: git clone --depth 1 --recurse-submodules -b ${{ env.SOURCE_BRANCH_NAME }} - name: Setup Environment variables run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi - name: Download a wheel accordingly to matrix @@ -132,7 +124,6 @@ jobs: build_sdist: [1] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true REPO_DIR: . PROJECT_SPEC: opencv-python PLAT: x86_64 @@ -158,10 +149,7 @@ jobs: echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi - name: Checkout - uses: actions/checkout@v3 - with: - submodules: false - fetch-depth: 0 + run: git clone --depth 1 -b ${{ env.SOURCE_BRANCH_NAME }} - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml index e66bb0ce..0d73c59c 100644 --- a/.github/workflows/build_wheels_linux_arm.yml +++ b/.github/workflows/build_wheels_linux_arm.yml @@ -34,7 +34,6 @@ jobs: build_sdist: [0] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true REPO_DIR: . PROJECT_SPEC: opencv-python MB_PYTHON_VERSION: ${{ matrix.python-version }} @@ -59,10 +58,7 @@ jobs: echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi - name: Checkout - uses: actions/checkout@v3 - with: - submodules: false - fetch-depth: 0 + run: git clone --depth 1 -b ${{ env.SOURCE_BRANCH_NAME }} - name: Build a package run: source scripts/build.sh - name: Saving all wheels @@ -92,7 +88,6 @@ jobs: build_sdist: [0] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true MB_PYTHON_VERSION: ${{ matrix.python-version }} PLAT: aarch64 NP_TEST_DEP: numpy==1.19.4 @@ -105,10 +100,7 @@ jobs: run: find . -mindepth 1 -delete working-directory: ${{ github.workspace }} - name: Checkout - uses: actions/checkout@v3 - with: - submodules: true - fetch-depth: 0 + run: git clone --depth 1 --recurse-submodules -b ${{ env.SOURCE_BRANCH_NAME }} - name: Setup Environment variables run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi - name: Download a wheel accordingly to matrix diff --git a/opencv b/opencv index 71d3237a..b31bc1a2 160000 --- a/opencv +++ b/opencv @@ -1 +1 @@ -Subproject commit 71d3237a093b60a27601c20e9ee6c3e52154e8b1 +Subproject commit b31bc1a2954e22d87f8384212c5e3dfbe7024f16 diff --git a/opencv_contrib b/opencv_contrib index 1ed3dd2c..f7d6288a 160000 --- a/opencv_contrib +++ b/opencv_contrib @@ -1 +1 @@ -Subproject commit 1ed3dd2c53888e3289afdb22ec4e9ebbff3dba87 +Subproject commit f7d6288aeb38ff1b8af70ecf50a98258e8cd1bef diff --git a/opencv_extra b/opencv_extra index dd1fbd07..0e3b933a 160000 --- a/opencv_extra +++ b/opencv_extra @@ -1 +1 @@ -Subproject commit dd1fbd0717ef4d83f86899b4144fdd9bc0364a5f +Subproject commit 0e3b933aa762b28b54a40034c58f8c734f1ed759 From 4f5eec932f4ae5f8a5275525e9dbf4880ba7a208 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 3 Dec 2024 13:19:51 +0300 Subject: [PATCH 04/10] more details. --- .github/workflows/build_wheels_linux.yml | 21 +++++++++++++++++--- .github/workflows/build_wheels_linux_arm.yml | 14 +++++++++++-- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index be662865..e3ecb668 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -58,7 +58,12 @@ jobs: echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi - name: Checkout - run: git clone --depth 1 -b ${{ env.SOURCE_BRANCH_NAME }} + run: | + echo "PR Author: ${{ env.PR_AUTHOR }}" + echo "PR Author fork: ${{ env.PR_AUTHOR_FORK }}" + echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" + echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" + git clone --depth 1 -b "${{ env.SOURCE_BRANCH_NAME }}" - name: Build a package run: source scripts/build.sh - name: Saving all wheels @@ -98,7 +103,12 @@ jobs: run: find . -mindepth 1 -delete working-directory: ${{ github.workspace }} - name: Checkout - run: git clone --depth 1 --recurse-submodules -b ${{ env.SOURCE_BRANCH_NAME }} + run: | + echo "PR Author: ${{ env.PR_AUTHOR }}" + echo "PR Author fork: ${{ env.PR_AUTHOR_FORK }}" + echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" + echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" + git clone --depth 1 --recurse-submodules -b "${{ env.SOURCE_BRANCH_NAME }}" - name: Setup Environment variables run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi - name: Download a wheel accordingly to matrix @@ -149,7 +159,12 @@ jobs: echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi - name: Checkout - run: git clone --depth 1 -b ${{ env.SOURCE_BRANCH_NAME }} + run: | + echo "PR Author: ${{ env.PR_AUTHOR }}" + echo "PR Author fork: ${{ env.PR_AUTHOR_FORK }}" + echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" + echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" + git clone --depth 1 -b "${{ env.SOURCE_BRANCH_NAME }}" - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml index 0d73c59c..99e3bd75 100644 --- a/.github/workflows/build_wheels_linux_arm.yml +++ b/.github/workflows/build_wheels_linux_arm.yml @@ -58,7 +58,12 @@ jobs: echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi - name: Checkout - run: git clone --depth 1 -b ${{ env.SOURCE_BRANCH_NAME }} + run: | + echo "PR Author: ${{ env.PR_AUTHOR }}" + echo "PR Author fork: ${{ env.PR_AUTHOR_FORK }}" + echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" + echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" + git clone --depth 1 -b "${{ env.SOURCE_BRANCH_NAME }}" - name: Build a package run: source scripts/build.sh - name: Saving all wheels @@ -100,7 +105,12 @@ jobs: run: find . -mindepth 1 -delete working-directory: ${{ github.workspace }} - name: Checkout - run: git clone --depth 1 --recurse-submodules -b ${{ env.SOURCE_BRANCH_NAME }} + run: | + echo "PR Author: ${{ env.PR_AUTHOR }}" + echo "PR Author fork: ${{ env.PR_AUTHOR_FORK }}" + echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" + echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" + git clone --depth 1 --recurse-submodules -b "${{ env.SOURCE_BRANCH_NAME }}" - name: Setup Environment variables run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi - name: Download a wheel accordingly to matrix From 1365e4958f6dc91cd6a907225cd1708b13344374 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 3 Dec 2024 13:26:02 +0300 Subject: [PATCH 05/10] Syntax fix. --- .github/workflows/build_wheels_linux.yml | 24 ++++++++------------ .github/workflows/build_wheels_linux_arm.yml | 16 +++++-------- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index e3ecb668..8f69e728 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -59,11 +59,9 @@ jobs: fi - name: Checkout run: | - echo "PR Author: ${{ env.PR_AUTHOR }}" - echo "PR Author fork: ${{ env.PR_AUTHOR_FORK }}" - echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" - echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" - git clone --depth 1 -b "${{ env.SOURCE_BRANCH_NAME }}" + echo "Source branch name: ${{ github.head_ref }}" + echo "Target branch name: ${{ github.base_ref }}" + git clone --depth 1 -b " ${{ github.head_ref }}" - name: Build a package run: source scripts/build.sh - name: Saving all wheels @@ -104,11 +102,9 @@ jobs: working-directory: ${{ github.workspace }} - name: Checkout run: | - echo "PR Author: ${{ env.PR_AUTHOR }}" - echo "PR Author fork: ${{ env.PR_AUTHOR_FORK }}" - echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" - echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" - git clone --depth 1 --recurse-submodules -b "${{ env.SOURCE_BRANCH_NAME }}" + echo "Source branch name: ${{ github.head_ref }}" + echo "Target branch name: ${{ github.base_ref }}" + git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" - name: Setup Environment variables run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi - name: Download a wheel accordingly to matrix @@ -160,11 +156,9 @@ jobs: fi - name: Checkout run: | - echo "PR Author: ${{ env.PR_AUTHOR }}" - echo "PR Author fork: ${{ env.PR_AUTHOR_FORK }}" - echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" - echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" - git clone --depth 1 -b "${{ env.SOURCE_BRANCH_NAME }}" + echo "Source branch name: ${{ github.head_ref }}" + echo "Target branch name: ${{ github.base_ref }}" + git clone --depth 1 -b "${{ github.head_ref }}" - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml index 99e3bd75..0eb1f45a 100644 --- a/.github/workflows/build_wheels_linux_arm.yml +++ b/.github/workflows/build_wheels_linux_arm.yml @@ -59,11 +59,9 @@ jobs: fi - name: Checkout run: | - echo "PR Author: ${{ env.PR_AUTHOR }}" - echo "PR Author fork: ${{ env.PR_AUTHOR_FORK }}" - echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" - echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" - git clone --depth 1 -b "${{ env.SOURCE_BRANCH_NAME }}" + echo "Source branch name: ${{ github.head_ref }}" + echo "Target branch name: ${{ github.base_ref }}" + git clone --depth 1 -b "${{ github.head_ref }}" - name: Build a package run: source scripts/build.sh - name: Saving all wheels @@ -106,11 +104,9 @@ jobs: working-directory: ${{ github.workspace }} - name: Checkout run: | - echo "PR Author: ${{ env.PR_AUTHOR }}" - echo "PR Author fork: ${{ env.PR_AUTHOR_FORK }}" - echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" - echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" - git clone --depth 1 --recurse-submodules -b "${{ env.SOURCE_BRANCH_NAME }}" + echo "Source branch name: ${{ github.head_ref }}" + echo "Target branch name: ${{ github.base_ref }}" + git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" - name: Setup Environment variables run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi - name: Download a wheel accordingly to matrix From 61e087c82d1a779f582fc7c8c99a910b4c6a5ac2 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 3 Dec 2024 13:31:38 +0300 Subject: [PATCH 06/10] Syntax fix. --- .github/workflows/build_wheels_linux.yml | 6 +++--- .github/workflows/build_wheels_linux_arm.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index 8f69e728..a1f89114 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -61,7 +61,7 @@ jobs: run: | echo "Source branch name: ${{ github.head_ref }}" echo "Target branch name: ${{ github.base_ref }}" - git clone --depth 1 -b " ${{ github.head_ref }}" + git clone --depth 1 -b " ${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" - name: Build a package run: source scripts/build.sh - name: Saving all wheels @@ -104,7 +104,7 @@ jobs: run: | echo "Source branch name: ${{ github.head_ref }}" echo "Target branch name: ${{ github.base_ref }}" - git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" + git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" - name: Setup Environment variables run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi - name: Download a wheel accordingly to matrix @@ -158,7 +158,7 @@ jobs: run: | echo "Source branch name: ${{ github.head_ref }}" echo "Target branch name: ${{ github.base_ref }}" - git clone --depth 1 -b "${{ github.head_ref }}" + git clone --depth 1 -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml index 0eb1f45a..ec81f601 100644 --- a/.github/workflows/build_wheels_linux_arm.yml +++ b/.github/workflows/build_wheels_linux_arm.yml @@ -61,7 +61,7 @@ jobs: run: | echo "Source branch name: ${{ github.head_ref }}" echo "Target branch name: ${{ github.base_ref }}" - git clone --depth 1 -b "${{ github.head_ref }}" + git clone --depth 1 -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" - name: Build a package run: source scripts/build.sh - name: Saving all wheels @@ -106,7 +106,7 @@ jobs: run: | echo "Source branch name: ${{ github.head_ref }}" echo "Target branch name: ${{ github.base_ref }}" - git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" + git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" - name: Setup Environment variables run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi - name: Download a wheel accordingly to matrix From a5bb4d1fb0aad7915f8d5d8b9c560437229f5064 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 3 Dec 2024 13:37:22 +0300 Subject: [PATCH 07/10] Define git clone location --- .github/workflows/build_wheels_linux.yml | 6 +++--- .github/workflows/build_wheels_linux_arm.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index a1f89114..9df69240 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -61,7 +61,7 @@ jobs: run: | echo "Source branch name: ${{ github.head_ref }}" echo "Target branch name: ${{ github.base_ref }}" - git clone --depth 1 -b " ${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" + git clone --depth 1 -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}" - name: Build a package run: source scripts/build.sh - name: Saving all wheels @@ -104,7 +104,7 @@ jobs: run: | echo "Source branch name: ${{ github.head_ref }}" echo "Target branch name: ${{ github.base_ref }}" - git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" + git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}" - name: Setup Environment variables run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi - name: Download a wheel accordingly to matrix @@ -158,7 +158,7 @@ jobs: run: | echo "Source branch name: ${{ github.head_ref }}" echo "Target branch name: ${{ github.base_ref }}" - git clone --depth 1 -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" + git clone --depth 1 -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}" - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml index ec81f601..bd5c0040 100644 --- a/.github/workflows/build_wheels_linux_arm.yml +++ b/.github/workflows/build_wheels_linux_arm.yml @@ -61,7 +61,7 @@ jobs: run: | echo "Source branch name: ${{ github.head_ref }}" echo "Target branch name: ${{ github.base_ref }}" - git clone --depth 1 -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" + git clone --depth 1 -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}" - name: Build a package run: source scripts/build.sh - name: Saving all wheels @@ -106,7 +106,7 @@ jobs: run: | echo "Source branch name: ${{ github.head_ref }}" echo "Target branch name: ${{ github.base_ref }}" - git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" + git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}" - name: Setup Environment variables run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi - name: Download a wheel accordingly to matrix From 2364c9489885c7f1a1eedecc511d12393615e2d7 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 3 Dec 2024 14:43:33 +0300 Subject: [PATCH 08/10] Qt version update. --- patches/patchQtPlugins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/patchQtPlugins b/patches/patchQtPlugins index 70c6975a..b274aa08 100644 --- a/patches/patchQtPlugins +++ b/patches/patchQtPlugins @@ -9,7 +9,7 @@ index 4c0b3880fc..dffa0a4caa 100644 + install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt) + endif() + if(UNIX AND NOT APPLE) -+ install(DIRECTORY /opt/Qt5.15.13/plugins DESTINATION lib/qt) ++ install(DIRECTORY /opt/Qt5.15.16/plugins DESTINATION lib/qt) + install(DIRECTORY /usr/share/fonts DESTINATION lib/qt) + endif() if(HAVE_QT_OPENGL) From d1068287d51b12b955fca926a7463607d366eb01 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 3 Dec 2024 14:59:02 +0300 Subject: [PATCH 09/10] Updated submodules to current 4.x branch. --- opencv | 2 +- opencv_contrib | 2 +- opencv_extra | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opencv b/opencv index b31bc1a2..03cedee0 160000 --- a/opencv +++ b/opencv @@ -1 +1 @@ -Subproject commit b31bc1a2954e22d87f8384212c5e3dfbe7024f16 +Subproject commit 03cedee0b0258875eafd1576b59d686ba805da7a diff --git a/opencv_contrib b/opencv_contrib index f7d6288a..67337620 160000 --- a/opencv_contrib +++ b/opencv_contrib @@ -1 +1 @@ -Subproject commit f7d6288aeb38ff1b8af70ecf50a98258e8cd1bef +Subproject commit 673376203b0a8371a31ec5e8f08910a9744c0f32 diff --git a/opencv_extra b/opencv_extra index 0e3b933a..08fe33c7 160000 --- a/opencv_extra +++ b/opencv_extra @@ -1 +1 @@ -Subproject commit 0e3b933aa762b28b54a40034c58f8c734f1ed759 +Subproject commit 08fe33c733cabec70ffb6e5eac49708b073e5277 From 4566781d7bad0d6caa88b7d834cd75033f9272c6 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 3 Dec 2024 15:26:53 +0300 Subject: [PATCH 10/10] Env update for Qt. --- docker/manylinux2014/Dockerfile_aarch64 | 2 -- docker/manylinux2014/Dockerfile_x86_64 | 2 -- travis_config.sh | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64 index 36c3bbed..9a8bfdde 100644 --- a/docker/manylinux2014/Dockerfile_aarch64 +++ b/docker/manylinux2014/Dockerfile_aarch64 @@ -141,5 +141,3 @@ RUN git config --global --add safe.directory /io ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/ffmpeg_build/lib/pkgconfig ENV LDFLAGS -L/ffmpeg_build/lib ENV PATH "$HOME/bin:$PATH" -# forces NodeJS 16 for Github actions, see https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/ -ENV ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64 index bb60a369..088d8df5 100644 --- a/docker/manylinux2014/Dockerfile_x86_64 +++ b/docker/manylinux2014/Dockerfile_x86_64 @@ -140,5 +140,3 @@ RUN git config --global --add safe.directory /io ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/ffmpeg_build/lib/pkgconfig ENV LDFLAGS -L/ffmpeg_build/lib ENV PATH "$HOME/bin:$PATH" -# forces NodeJS 16 for Github actions, see https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/ -ENV ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true diff --git a/travis_config.sh b/travis_config.sh index 903ceafb..fcdd4f60 100644 --- a/travis_config.sh +++ b/travis_config.sh @@ -34,7 +34,7 @@ if [ -n "$IS_OSX" ]; then export MAKEFLAGS="-j$(sysctl -n hw.ncpu)" else echo " > Linux environment " - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.13/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.16/lib export MAKEFLAGS="-j$(grep -E '^processor[[:space:]]*:' /proc/cpuinfo | wc -l)" CURRENT_ARCH=$(uname -m) if [[ $CURRENT_ARCH == 'aarch64' ]]; then