[glib/ci-update: 5/7] ci: Remove Android and MingW bits from the fedora Dockerfile
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/ci-update: 5/7] ci: Remove Android and MingW bits from the fedora Dockerfile
- Date: Tue, 30 Apr 2019 14:46:09 +0000 (UTC)
commit 5e504a4a776a887699fa161f7550002089c8a4f9
Author: Emmanuele Bassi <ebassi gnome org>
Date: Tue Apr 30 13:24:04 2019 +0100
ci: Remove Android and MingW bits from the fedora Dockerfile
These live in their own Dockerfiles, now.
.gitlab-ci/fedora.Dockerfile | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 69d8c8af2..debec6812 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,11 +1,10 @@
FROM fedora:29
RUN dnf -y install \
- autoconf \
- automake \
bindfs \
clang \
clang-analyzer \
+ dbus-daemon \
desktop-file-utils \
elfutils-libelf-devel \
findutils \
@@ -38,20 +37,14 @@ RUN dnf -y install \
libffi-devel \
libmount-devel \
libselinux-devel \
- libtool \
libxslt \
- make \
- mingw64-gcc \
- mingw64-gcc-c++ \
- mingw64-gettext \
- mingw64-libffi \
- mingw64-zlib \
ncurses-compat-libs \
ninja-build \
pcre-devel \
python3 \
python3-pip \
python3-wheel \
+ shared-mime-info \
systemtap-sdt-devel \
unzip \
wget \
@@ -59,17 +52,6 @@ RUN dnf -y install \
zlib-devel \
&& 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
ARG HOST_USER_ID=5555
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]