From a9b68f1f9b3c04b01d3562aafcade10f238e8dfa Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 18 Mar 2022 10:29:28 +0000 Subject: [PATCH 1/3] ci: Update Coverity image to Fedora 34 and latest Coverity Scan tool Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 3 +-- .gitlab-ci/coverity.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7673f4168..8b91bdde2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ cache: variables: FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v13" - COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v2" + COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v3" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v9" ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v5" MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v4" @@ -525,7 +525,6 @@ coverity: --libdir=lib -Dsystemtap=true -Ddtrace=true - -Dfam=true -Dinstalled_tests=true _coverity_build - $HOME/cov-analysis-linux64-*/bin/cov-build --dir cov-int ninja -C _coverity_build diff --git a/.gitlab-ci/coverity.Dockerfile b/.gitlab-ci/coverity.Dockerfile index bcc4b9a00..2585711c5 100644 --- a/.gitlab-ci/coverity.Dockerfile +++ b/.gitlab-ci/coverity.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/glib/fedora:v12 +FROM registry.gitlab.gnome.org/gnome/glib/fedora:v13 ARG COVERITY_SCAN_PROJECT_NAME ARG COVERITY_SCAN_TOKEN From 4e7b76344cb9e1797ba1b9866de483304afb53bd Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 18 Mar 2022 10:38:41 +0000 Subject: [PATCH 2/3] ci: Update mingw image to Fedora 34 Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 2 +- .gitlab-ci/mingw.Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b91bdde2..491d7d1bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ variables: COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v3" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v9" ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v5" - MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v4" + MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v5" MESON_TEST_TIMEOUT_MULTIPLIER: 2 G_MESSAGES_DEBUG: all MESON_COMMON_OPTIONS_NO_WARNING: "--buildtype debug --wrap-mode=nodownload" diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile index 293d91a5d..eb773e0f1 100644 --- a/.gitlab-ci/mingw.Dockerfile +++ b/.gitlab-ci/mingw.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:33 +FROM fedora:34 RUN dnf -y install \ bindfs \ @@ -8,7 +8,6 @@ RUN dnf -y install \ elfutils-libelf-devel \ findutils \ fuse \ - gamin-devel \ gcc \ gcc-c++ \ gettext \ From 46c6ed231ed27878eaa128a4aaa3d96589ea03dc Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 18 Mar 2022 11:18:13 +0000 Subject: [PATCH 3/3] ci: Update Android NDK image to Fedora 34 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don’t take the opportunity to add support for Android API 31 or update the version of the Android NDK we’re using to r23b, though, as I couldn’t quickly get that to work and ran out of time. Bumping the Fedora version will at least reduce our CI repository disk usage through sharing the base image. Signed-off-by: Philip Withnall Helps: #2605 --- .gitlab-ci.yml | 2 +- .gitlab-ci/android-ndk.Dockerfile | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 491d7d1bd..b44008ab0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ variables: FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v13" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v3" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v9" - ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v5" + ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v6" MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v5" MESON_TEST_TIMEOUT_MULTIPLIER: 2 G_MESSAGES_DEBUG: all diff --git a/.gitlab-ci/android-ndk.Dockerfile b/.gitlab-ci/android-ndk.Dockerfile index 5ef4fc507..1ea3622e7 100644 --- a/.gitlab-ci/android-ndk.Dockerfile +++ b/.gitlab-ci/android-ndk.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:33 +FROM fedora:34 RUN dnf -y install \ autoconf \ @@ -10,7 +10,6 @@ RUN dnf -y install \ elfutils-libelf-devel \ findutils \ fuse \ - gamin-devel \ gcc \ gcc-c++ \ gettext \ @@ -61,7 +60,17 @@ COPY android-download-ndk.sh . RUN ./android-download-ndk.sh COPY android-setup-env.sh . RUN ./android-setup-env.sh arm64 28 -RUN rm -rf $ANDROID_NDK_PATH +# Explicitly remove some directories first to fix symlink traversal problems +RUN rm -rf \ + $ANDROID_NDK_PATH/sources/third_party/vulkan/src/tests/layers \ + $ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/containers/unord/unord.multimap/unord.multimap.modifiers \ + $ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/containers/unord/unord.multiset/unord.multiset.cnstr \ + $ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum \ + $ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory_symlink \ + $ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_directory \ + $ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_hard_link \ + $ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory \ + $ANDROID_NDK_PATH RUN pip3 install meson==0.52.0