luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-16 12:28:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: Update Android and mingw CI images

Browse Source 
Fedora 29 is no longer available, and I need to rebuild these images so
libpcre is pre-downloaded as a subproject.

Update them to Fedora 31, which is what we use in `fedora.Dockerfile`.
This should allow some blobs to be shared in the container repository.

This isn’t the latest Fedora release, but I don’t want to go through the
hassle of updating all the CI images to F33 right now in addition to
updating the subproject caches.

`python-unversioned-command` is needed because the Android NDK calls
`python` without a version number. F29 must have installed this already.
The Android NDK setup appears to be OK with Python 3.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Helps: #962
This commit is contained in:
Philip Withnall 2021-06-16 16:41:22 +01:00
parent 4de3ea4ead
commit 1602ca1d3e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
FROM fedora:28 FROM fedora:31
RUN dnf -y install \ RUN dnf -y install \
autoconf \ autoconf \
@ -44,6 +44,7 @@ RUN dnf -y install \
ncurses-compat-libs \ ncurses-compat-libs \
ninja-build \ ninja-build \
pcre-devel \ pcre-devel \
python-unversioned-command \
python3 \ python3 \
python3-pip \ python3-pip \
python3-wheel \ python3-wheel \

2
.gitlab-ci/mingw.Dockerfile
View File

@ -1,4 +1,4 @@
FROM fedora:29 FROM fedora:31
RUN dnf -y install \ RUN dnf -y install \
bindfs \ bindfs \