Skip to content

Commit a0cc605

Browse files
committed
Dependencies update and hack for NodeJS 16.
1 parent 6a181ce commit a0cc605

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

.github/workflows/build_wheels_linux.yml

Lines changed: 2 additions & 2 deletions
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
@@ -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 }}

.github/workflows/build_wheels_linux_arm.yml

Lines changed: 1 addition & 1 deletion
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 }}

docker/manylinux2014/Dockerfile_aarch64

Lines changed: 8 additions & 6 deletions
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
@@ -141,3 +141,5 @@ RUN git config --global --add safe.directory /io
141141
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/ffmpeg_build/lib/pkgconfig
142142
ENV LDFLAGS -L/ffmpeg_build/lib
143143
ENV PATH "$HOME/bin:$PATH"
144+
# 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/
145+
ENV ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true

docker/manylinux2014/Dockerfile_x86_64

Lines changed: 8 additions & 6 deletions
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
@@ -140,3 +140,5 @@ RUN git config --global --add safe.directory /io
140140
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/ffmpeg_build/lib/pkgconfig
141141
ENV LDFLAGS -L/ffmpeg_build/lib
142142
ENV PATH "$HOME/bin:$PATH"
143+
# 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/
144+
ENV ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true

0 commit comments

Comments
 (0)