From 21c4a54e327741cfa8558cb596216b1a30cdbc4c Mon Sep 17 00:00:00 2001 From: Mark Horvath Date: Fri, 17 Jan 2025 14:21:02 +0000 Subject: [PATCH] Update the CI docker image Image rebuilt with latest packages OpenCV 4.10.0 has a warning with latest clang, so the specific warning is turned off to let the CI pass. --- .devcontainer/Dockerfile | 4 ++-- .gitlab-ci.yml | 4 ++-- scripts/ci-opencv.sh | 8 +++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 72df1c94b..84e67fc9e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,9 +1,9 @@ -# SPDX-FileCopyrightText: 2024 Arm Limited and/or its affiliates +# SPDX-FileCopyrightText: 2024 - 2025 Arm Limited and/or its affiliates # # SPDX-License-Identifier: Apache-2.0 # If changing this image ID, please also change it in .gitlab-ci.yml -FROM registry.gitlab.arm.com/kleidi/kleidicv:13 +FROM registry.gitlab.arm.com/kleidi/kleidicv:14 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49bd3f5c3..4259d256d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,9 @@ -# SPDX-FileCopyrightText: 2024 Arm Limited and/or its affiliates +# SPDX-FileCopyrightText: 2024 - 2025 Arm Limited and/or its affiliates # # SPDX-License-Identifier: Apache-2.0 # If changing this image ID, please also change it in .devcontainer/Dockerfile -image: registry.gitlab.arm.com/kleidi/kleidicv:13 +image: registry.gitlab.arm.com/kleidi/kleidicv:14 variables: KUBERNETES_CPU_REQUEST: "16" diff --git a/scripts/ci-opencv.sh b/scripts/ci-opencv.sh index 1c96e46e1..ba8ff1158 100755 --- a/scripts/ci-opencv.sh +++ b/scripts/ci-opencv.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# SPDX-FileCopyrightText: 2024 Arm Limited and/or its affiliates +# SPDX-FileCopyrightText: 2024 - 2025 Arm Limited and/or its affiliates # # SPDX-License-Identifier: Apache-2.0 @@ -26,7 +26,6 @@ EXTRA_CMAKE_ARGS="\ -DKLEIDICV_ENABLE_SME2=ON \ -DBUILD_ANDROID_EXAMPLES=OFF \ -DBUILD_ANDROID_PROJECTS=OFF \ - -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ -DCV_TRACE=OFF \ -DBUILD_EXAMPLES=OFF \ -DBUILD_opencv_apps=OFF \ @@ -52,8 +51,11 @@ EXTRA_CMAKE_ARGS="\ -DWITH_IMGCODEC_PFM=OFF \ -DWITH_ADE=OFF \ -DWITH_LAPACK=OFF \ - -DOPENCV_PYTHON_SKIP_DETECTION=ON" \ + -DOPENCV_PYTHON_SKIP_DETECTION=ON \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ + -DCMAKE_CXX_FLAGS=-Wno-nontrivial-memcall" \ ./scripts/build-opencv.sh +# OpenCV 4.10.0 has a warning with latest clang, so the specific warning is turned off. # ------------------------------------------------------------------------------ # Run OpenCV conformity checks -- GitLab