luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-12 20:36:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci: Remove Android and MingW bits from the fedora Dockerfile

Browse Source 
These live in their own Dockerfiles, now.
This commit is contained in:
Emmanuele Bassi 2019-04-30 13:24:04 +01:00
parent 15d13d1e97
commit ee9afb33af
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.gitlab-ci/fedora.Dockerfile
View File

@ -1,11 +1,10 @@
FROM fedora:29 FROM fedora:29
RUN dnf -y install \ RUN dnf -y install \
autoconf \
automake \
bindfs \ bindfs \
clang \ clang \
clang-analyzer \ clang-analyzer \
dbus-daemon \
desktop-file-utils \ desktop-file-utils \
elfutils-libelf-devel \ elfutils-libelf-devel \
findutils \ findutils \
@ -38,20 +37,14 @@ RUN dnf -y install \
libffi-devel \ libffi-devel \
libmount-devel \ libmount-devel \
libselinux-devel \ libselinux-devel \
libtool \
libxslt \ libxslt \
make \
mingw64-gcc \
mingw64-gcc-c++ \
mingw64-gettext \
mingw64-libffi \
mingw64-zlib \
ncurses-compat-libs \ ncurses-compat-libs \
ninja-build \ ninja-build \
pcre-devel \ pcre-devel \
python3 \ python3 \
python3-pip \ python3-pip \
python3-wheel \ python3-wheel \
shared-mime-info \
systemtap-sdt-devel \ systemtap-sdt-devel \
unzip \ unzip \
wget \ wget \
@ -59,17 +52,6 @@ RUN dnf -y install \
zlib-devel \ zlib-devel \
&& dnf clean all && dnf clean all
WORKDIR /opt
ENV ANDROID_NDK_PATH /opt/android-ndk
COPY android-download-ndk.sh .
RUN ./android-download-ndk.sh
COPY android-setup-env.sh .
RUN ./android-setup-env.sh arm64 21
RUN ./android-setup-env.sh arm64 28
RUN rm -rf $ANDROID_NDK_PATH
COPY cross_file_mingw64.txt /opt
RUN pip3 install meson==0.48.0 RUN pip3 install meson==0.48.0
ARG HOST_USER_ID=5555 ARG HOST_USER_ID=5555