Merge branch 'fix-cpu-docker' into 'master'

ci: Update Android Docker image for aarch64 CPU naming change

See merge request GNOME/glib!1402
This commit is contained in:
Sebastian Dröge 2020-05-14 15:12:48 +00:00
commit 12fbb286ae

View File

@ -12,7 +12,7 @@ cache:
variables:
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v8"
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v6"
ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v2"
ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v3"
MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v2"
MESON_TEST_TIMEOUT_MULTIPLIER: 2
G_MESSAGES_DEBUG: all