Skip to content

Commit 3f50d32

Browse files
asmorkalovasmorkalov
authored
Linux dependencies update (#1052)
* Base manylinux2014 image update. * Use command line git to checkout repo instead of actions step. * Qt and others update. * Updated submodules to current 4.x branch.
1 parent c0fe8eb commit 3f50d32

9 files changed

+40
-40
lines changed

‎.github/workflows/build_wheels_linux.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
MB_ML_VER: 2014
4242
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4343
CONFIG_PATH: travis_config.sh
44-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20240524
44+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20241202
4545
USE_CCACHE: 0
4646
UNICODE_WIDTH: 32
4747
PLAT: x86_64
@@ -58,10 +58,10 @@ jobs:
5858
echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
5959
fi
6060
- name: Checkout
61-
uses: actions/checkout@v3
62-
with:
63-
submodules: false
64-
fetch-depth: 0
61+
run: |
62+
echo "Source branch name: ${{ github.head_ref }}"
63+
echo "Target branch name: ${{ github.base_ref }}"
64+
git clone --depth 1 -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}"
6565
- name: Build a package
6666
run: source scripts/build.sh
6767
- name: Saving all wheels
@@ -101,10 +101,10 @@ jobs:
101101
run: find . -mindepth 1 -delete
102102
working-directory: ${{ github.workspace }}
103103
- name: Checkout
104-
uses: actions/checkout@v3
105-
with:
106-
submodules: true
107-
fetch-depth: 0
104+
run: |
105+
echo "Source branch name: ${{ github.head_ref }}"
106+
echo "Target branch name: ${{ github.base_ref }}"
107+
git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}"
108108
- name: Setup Environment variables
109109
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
110110
- name: Download a wheel accordingly to matrix
@@ -139,7 +139,7 @@ jobs:
139139
NP_TEST_DEP: numpy==1.19.4
140140
TRAVIS_BUILD_DIR: ${{ github.workspace }}
141141
CONFIG_PATH: travis_config.sh
142-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20240524
142+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20241202
143143
USE_CCACHE: 1
144144
UNICODE_WIDTH: 32
145145
SDIST: ${{ matrix.build_sdist || 0 }}
@@ -155,10 +155,10 @@ jobs:
155155
echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
156156
fi
157157
- name: Checkout
158-
uses: actions/checkout@v3
159-
with:
160-
submodules: false
161-
fetch-depth: 0
158+
run: |
159+
echo "Source branch name: ${{ github.head_ref }}"
160+
echo "Target branch name: ${{ github.base_ref }}"
161+
git clone --depth 1 -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}"
162162
- name: Set up Python ${{ matrix.python-version }}
163163
uses: actions/setup-python@v4
164164
with:

‎.github/workflows/build_wheels_linux_arm.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
MB_ML_VER: 2014
4343
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4444
CONFIG_PATH: travis_config.sh
45-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20240524
45+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20241202
4646
USE_CCACHE: 0
4747
UNICODE_WIDTH: 32
4848
SDIST: ${{ matrix.build_sdist || 0 }}
@@ -58,10 +58,10 @@ jobs:
5858
echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
5959
fi
6060
- name: Checkout
61-
uses: actions/checkout@v3
62-
with:
63-
submodules: false
64-
fetch-depth: 0
61+
run: |
62+
echo "Source branch name: ${{ github.head_ref }}"
63+
echo "Target branch name: ${{ github.base_ref }}"
64+
git clone --depth 1 -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}"
6565
- name: Build a package
6666
run: source scripts/build.sh
6767
- name: Saving all wheels
@@ -103,10 +103,10 @@ jobs:
103103
run: find . -mindepth 1 -delete
104104
working-directory: ${{ github.workspace }}
105105
- name: Checkout
106-
uses: actions/checkout@v3
107-
with:
108-
submodules: true
109-
fetch-depth: 0
106+
run: |
107+
echo "Source branch name: ${{ github.head_ref }}"
108+
echo "Target branch name: ${{ github.base_ref }}"
109+
git clone --depth 1 --recurse-submodules -b "${{ github.head_ref }}" "https://github.com/${{ github.event.pull_request.head.repo.full_name }}" "${{ github.workspace }}"
110110
- name: Setup Environment variables
111111
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
112112
- name: Download a wheel accordingly to matrix

‎docker/manylinux2014/Dockerfile_aarch64

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# Version: 20240524
1+
# Version: 20241202
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
33

44
FROM quay.io/pypa/manylinux2014_aarch64:latest
55

66
ARG CCACHE_VERSION=3.7.9
7-
ARG FFMPEG_VERSION=5.1.4
8-
ARG FREETYPE_VERSION=2.13.2
9-
ARG LIBPNG_VERSION=1.6.43
10-
ARG VPX_VERSION=v1.14.0
7+
ARG FFMPEG_VERSION=5.1.6
8+
ARG FREETYPE_VERSION=2.13.3
9+
ARG LIBPNG_VERSION=1.6.44
10+
ARG VPX_VERSION=v1.15.0
1111
ARG NASM_VERSION=2.15.04
1212
ARG OPENSSL_VERSION=1_1_1w
13-
ARG QT_VERSION=5.15.13
13+
ARG QT_VERSION=5.15.16
1414
ARG YASM_VERSION=1.3.0
1515

1616
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH

‎docker/manylinux2014/Dockerfile_x86_64

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# Version: 20240524
1+
# Version: 20241202
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
33

44
FROM quay.io/pypa/manylinux2014_x86_64:latest
55

66
ARG CCACHE_VERSION=3.7.9
7-
ARG FFMPEG_VERSION=5.1.4
8-
ARG FREETYPE_VERSION=2.13.2
9-
ARG LIBPNG_VERSION=1.6.43
10-
ARG VPX_VERSION=v1.14.0
7+
ARG FFMPEG_VERSION=5.1.6
8+
ARG FREETYPE_VERSION=2.13.3
9+
ARG LIBPNG_VERSION=1.6.44
10+
ARG VPX_VERSION=v1.15.0
1111
ARG NASM_VERSION=2.15.04
1212
ARG OPENSSL_VERSION=1_1_1w
13-
ARG QT_VERSION=5.15.13
13+
ARG QT_VERSION=5.15.16
1414
ARG YASM_VERSION=1.3.0
1515

1616
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH

‎opencv

Submodule opencv updated 692 files

‎opencv_contrib

Submodule opencv_contrib updated 122 files

‎opencv_extra

Submodule opencv_extra updated 90 files

‎patches/patchQtPlugins

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ index 4c0b3880fc..dffa0a4caa 100644
99
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
1010
+ endif()
1111
+ if(UNIX AND NOT APPLE)
12-
+ install(DIRECTORY /opt/Qt5.15.13/plugins DESTINATION lib/qt)
12+
+ install(DIRECTORY /opt/Qt5.15.16/plugins DESTINATION lib/qt)
1313
+ install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
1414
+ endif()
1515
if(HAVE_QT_OPENGL)

‎travis_config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if [ -n "$IS_OSX" ]; then
3434
export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"
3535
else
3636
echo " > Linux environment "
37-
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.13/lib
37+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.16/lib
3838
export MAKEFLAGS="-j$(grep -E '^processor[[:space:]]*:' /proc/cpuinfo | wc -l)"
3939
CURRENT_ARCH=$(uname -m)
4040
if [[ $CURRENT_ARCH == 'aarch64' ]]; then

0 commit comments

Comments
 (0)