Skip to content

Commit 0b447a8

Browse files
committed
Pipelines update for FFmpeg 5 and security fixes.
1 parent b7a1da7 commit 0b447a8

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Diff for: .github/workflows/build_wheels_linux.yml

+1-1
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:20220824
44+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20221205
4545
USE_CCACHE: 0
4646
UNICODE_WIDTH: 32
4747
PLAT: x86_64

Diff for: .github/workflows/build_wheels_linux_arm.yml

+1-1
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:20220824
45+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20221205
4646
USE_CCACHE: 0
4747
UNICODE_WIDTH: 32
4848
SDIST: ${{ matrix.build_sdist || 0 }}

Diff for: .github/workflows/build_wheels_macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
USE_CCACHE: 1
4646
UNICODE_WIDTH: 32
4747
PLAT: x86_64
48-
FFMPEG_FORMULA_VERSION: '@4'
48+
FFMPEG_FORMULA_VERSION: '@5'
4949
SDIST: ${{ matrix.build_sdist || 0 }}
5050
ENABLE_HEADLESS: ${{ matrix.without_gui }}
5151
ENABLE_CONTRIB: ${{ matrix.with_contrib }}

Diff for: docker/manylinux2014/Dockerfile_aarch64

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version: 20220824
1+
# Version: 20221205
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
33

44
FROM quay.io/pypa/manylinux2014_aarch64:latest
@@ -11,7 +11,7 @@ ARG NASM_VERSION=2.15.04
1111
ARG OPENSSL_VERSION=1_1_1s
1212
ARG QT_VERSION=5.15.0
1313
ARG YASM_VERSION=1.3.0
14-
ARG ZLIB_VERSION=1.2.12
14+
ARG ZLIB_VERSION=1.2.13
1515

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

Diff for: docker/manylinux2014/Dockerfile_x86_64

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version: 20220824
1+
# Version: 20221205
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
33

44
FROM quay.io/pypa/manylinux2014_x86_64:latest
@@ -11,7 +11,7 @@ ARG NASM_VERSION=2.15.04
1111
ARG OPENSSL_VERSION=1_1_1s
1212
ARG QT_VERSION=5.15.0
1313
ARG YASM_VERSION=1.3.0
14-
ARG ZLIB_VERSION=1.2.12
14+
ARG ZLIB_VERSION=1.2.13
1515

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

0 commit comments

Comments
 (0)