Skip to content

Commit 49bb977

Browse files
authored
Cover QT with ARM Ubuntu 24.04 build (#283)
1 parent 38e11d3 commit 49bb977

5 files changed

Lines changed: 15 additions & 14 deletions

File tree

.github/workflows/OCV-PR-4.x-ARM64-Debug.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
env:
16-
EXTRA_CMAKE_OPTIONS: '-DCV_DISABLE_OPTIMIZATION=ON -DWITH_IMGCODEC_GIF=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'
16+
EXTRA_CMAKE_OPTIONS: '-DWITH_QT=ON -DCV_DISABLE_OPTIMIZATION=ON -DWITH_IMGCODEC_GIF=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'
1717
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
1818
PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }}
1919
SOURCE_BRANCH_NAME: ${{ github.head_ref }}
@@ -34,7 +34,7 @@ jobs:
3434
run:
3535
shell: bash
3636
container:
37-
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251124
37+
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201
3838
volumes:
3939
- /home/opencv-cn/git_cache:/home/ci/git_cache
4040
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
@@ -206,7 +206,7 @@ jobs:
206206
run:
207207
shell: bash
208208
container:
209-
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251124
209+
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201
210210
volumes:
211211
- /home/opencv-cn/git_cache:/home/ci/git_cache
212212
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache

.github/workflows/OCV-PR-4.x-ARM64.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
env:
16-
EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DWITH_IMGCODEC_GIF=ON -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 -DOPENCV_DOWNLOAD_PATH=/home/ci/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON'
16+
EXTRA_CMAKE_OPTIONS: '-DWITH_QT=ON -DBUILD_DOCS=ON -DWITH_IMGCODEC_GIF=ON -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 -DOPENCV_DOWNLOAD_PATH=/home/ci/binaries_cache -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON'
1717
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
1818
PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }}
1919
SOURCE_BRANCH_NAME: ${{ github.head_ref }}
@@ -35,7 +35,7 @@ jobs:
3535
run:
3636
shell: bash
3737
container:
38-
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251124
38+
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201
3939
volumes:
4040
- /home/opencv-cn/git_cache:/home/ci/git_cache
4141
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
@@ -254,7 +254,7 @@ jobs:
254254
run:
255255
shell: bash
256256
container:
257-
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251124
257+
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201
258258
volumes:
259259
- /home/opencv-cn/git_cache:/home/ci/git_cache
260260
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache

.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
env:
16-
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'
16+
EXTRA_CMAKE_OPTIONS: '-DWITH_QT=ON -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'
1717
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
1818
PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }}
1919
SOURCE_BRANCH_NAME: ${{ github.head_ref }}
@@ -32,7 +32,7 @@ jobs:
3232
run:
3333
shell: bash
3434
container:
35-
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251124
35+
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201
3636
volumes:
3737
- /home/opencv-cn/git_cache:/home/ci/git_cache
3838
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
@@ -208,7 +208,7 @@ jobs:
208208
run:
209209
shell: bash
210210
container:
211-
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251124
211+
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201
212212
volumes:
213213
- /home/opencv-cn/git_cache:/home/ci/git_cache
214214
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache

.github/workflows/OCV-PR-5.x-ARM64.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
env:
16-
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'
16+
EXTRA_CMAKE_OPTIONS: '-DWITH_QT=ON -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'
1717
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
1818
PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }}
1919
SOURCE_BRANCH_NAME: ${{ github.head_ref }}
@@ -35,7 +35,7 @@ jobs:
3535
run:
3636
shell: bash
3737
container:
38-
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251124
38+
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201
3939
volumes:
4040
- /home/opencv-cn/git_cache:/home/ci/git_cache
4141
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
@@ -270,7 +270,7 @@ jobs:
270270
run:
271271
shell: bash
272272
container:
273-
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251124
273+
image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201
274274
volumes:
275275
- /home/opencv-cn/git_cache:/home/ci/git_cache
276276
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache

docker/ubuntu/Dockerfile-arm64-24

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version: 20251124
1+
# Version: 20251201
22
# Image name: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64
33

44
FROM ubuntu:24.04
@@ -41,7 +41,8 @@ RUN \
4141
libavif-dev \
4242
libjxl-dev \
4343
libopenexr-dev \
44-
libgtk-3-dev \
44+
qt6-base-dev \
45+
qt6-5compat-dev \
4546
libcamera-dev \
4647
libavcodec-dev \
4748
libavformat-dev \

0 commit comments

Comments
 (0)