luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci: Update Android NDK image to Fedora 34

Browse Source 
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 <pwithnall@endlessos.org>

Helps: #2605
This commit is contained in:
Philip Withnall 2022-03-18 11:18:13 +00:00
parent 4e7b76344c
commit 46c6ed231e
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -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

15
.gitlab-ci/android-ndk.Dockerfile
View File

@ -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