gitlab: remove the android gst-build target

android is now being tested using cerbero for the binaries we produce.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbdf73a..5a86523 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,15 +92,6 @@ fedora amd64 docker:
     DOCKERFILE: "docker/fedora/Dockerfile"
   extends: .base
 
-ubuntu amd64 docker:
-  stage: "build docker"
-  variables:
-    ARCH: "amd64"
-    TAG: "ubuntu"
-    CONTEXT_DIR: "docker/ubuntu/"
-    DOCKERFILE: "docker/ubuntu/Dockerfile"
-  extends: .base
-
 cerbero fedora amd64 docker:
   stage: "build docker"
   variables:
@@ -125,18 +116,6 @@ build fedora x86_64 local:
     refs:
       - "master@gstreamer/gst-ci"
 
-build android 28 local:
-  extends: '.build local'
-  variables:
-    MESON_ARGS: >
-      -Dbad=enabled
-      -Dbad:androidmedia=enabled
-      --cross-file cross-files/android_arm64_api28.txt
-  image: "${CI_REGISTRY_IMAGE}/amd64/ubuntu:latest"
-  except:
-    refs:
-      - "master@gstreamer/gst-ci"
-
 build cerbero fedora x86_64 local:
   extends: '.cerbero fedora x86_64'
   image: "${CI_REGISTRY_IMAGE}/amd64/cerbero-fedora:latest"

diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
deleted file mode 100644 (file)
index 67a2095..0000000
--- a/docker/ubuntu/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM ubuntu:18.04
-
-COPY prepare.sh cleanup.sh android-download-ndk.sh android-create-toolchain.sh /root/
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN sh /root/prepare.sh && \
-    sh /root/cleanup.sh

diff --git a/docker/ubuntu/android-create-toolchain.sh b/docker/ubuntu/android-create-toolchain.sh
deleted file mode 100755 (executable)
index 996dfe2..0000000
--- a/docker/ubuntu/android-create-toolchain.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-#
-# Copyright 2018 Collabora ltd.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Xavier Claessens <xavier.claessens@collabora.com>
-#
-
-set -eu
-
-arch=$1
-api=$2
-toolchain_path=/opt/android-$arch-api$api
-/opt/android-ndk/build/tools/make_standalone_toolchain.py --arch $arch --api $api --install-dir $toolchain_path

diff --git a/docker/ubuntu/android-download-ndk.sh b/docker/ubuntu/android-download-ndk.sh
deleted file mode 100755 (executable)
index 566543e..0000000
--- a/docker/ubuntu/android-download-ndk.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-#
-# Copyright 2018 Collabora ltd.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Xavier Claessens <xavier.claessens@collabora.com>
-#
-
-set -eu
-
-# Download Android NDK
-ANDROID_NDK_VERSION="r18b"
-ANDROID_NDK_SHA512="a35ab95ece52819194a3874fd210abe5c25905212c4aafe5d75c465c14739a46340d1ff0944ad93ffbbc9c0d86107119399d4f60ec6c5f080758008e75c19617"
-wget --quiet https://dl.google.com/android/repository/android-ndk-$ANDROID_NDK_VERSION-linux-x86_64.zip
-echo "$ANDROID_NDK_SHA512  android-ndk-$ANDROID_NDK_VERSION-linux-x86_64.zip" | sha512sum -c
-unzip android-ndk-$ANDROID_NDK_VERSION-linux-x86_64.zip
-rm android-ndk-$ANDROID_NDK_VERSION-linux-x86_64.zip
-mv android-ndk-$ANDROID_NDK_VERSION /opt/android-ndk

diff --git a/docker/ubuntu/cleanup.sh b/docker/ubuntu/cleanup.sh
deleted file mode 100644 (file)
index 33032b1..0000000
--- a/docker/ubuntu/cleanup.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-set -eu
-
-echo "Removing apt cache"
-rm -R /root/*
-rm -R /var/lib/apt/ /var/log/apt/

diff --git a/docker/ubuntu/prepare.sh b/docker/ubuntu/prepare.sh
deleted file mode 100644 (file)
index c5b74a0..0000000
--- a/docker/ubuntu/prepare.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-set -eu
-
-# make source packages available in order to figure out build dependencies
-sed -i "s/# deb-src/deb-src/g" /etc/apt/sources.list
-
-apt update
-apt build-dep -y \
-    orc \
-    gstreamer1.0 \
-    gst-plugins-base1.0 \
-    gst-plugins-good1.0 \
-    gst-plugins-bad1.0 \
-    gst-plugins-ugly1.0 \
-    gst-libav1.0 \
-    gst-rtsp-server1.0 \
-    gst-python1.0 \
-    gstreamer-vaapi \
-    gstreamer-editing-services1.0
-
-apt install -y \
-    ccache \
-    gdb \
-    git \
-    xvfb \
-    python3-pip \
-    wget \
-    unzip
-
-pip3 install meson
-
-# Configure git for various usage
-git config --global user.email "gst-build@gstreamer.net"
-git config --global user.name "Gstbuild Runner"
-
-# Setup Android toolchain
-/root/android-download-ndk.sh
-/root/android-create-toolchain.sh arm64 28
-rm -rf /opt/android-ndk
-
-# get gst-build and make all subprojects available
-git clone git://anongit.freedesktop.org/gstreamer/gst-build '/gst-build/'
-meson subprojects download --sourcedir /gst-build

diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index 3d77720..912a153 100644 (file)
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -10,7 +10,6 @@ stages:
 variables:
   CERBERO_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/cerbero-fedora:fb5e6c259536f2733ac2901f04fffffb35c510b5'
   FEDORA_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora:b8c24cc7f4cfb19813a324cbbb65c5e89b55eebc'
-  ANDROID_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/ubuntu:b16ec7445ff7874d905eb5759ceaee5f93d29e66'
   INDENT_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/gst-indent:6f7e01e1e30a73efa880acdc8e911f1f20c58dbb'
   MANIFEST_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/build-manifest:d19082b72667fb3382bdc3621520c4d26e258b2e'
 
@@ -117,15 +116,6 @@ build fedora x86_64:
   variables:
     MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dsharp=enabled"
 
-build android arm64 api28:
-  extends: '.build'
-  image: $ANDROID_IMAGE
-  variables:
-    MESON_ARGS: >
-      -Dbad=enabled
-      -Dbad:androidmedia=enabled
-      --cross-file cross-files/android_arm64_api28.txt
-
 .test:
   stage: 'test'
   variables: