From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 28 Aug 2015 23:14:53 +0000 (-0700)
Subject: GitLab CI: Java is required to set up the SDK
X-Git-Tag: 0.5.0~159
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=79749fe8b41685bee1d0c5695a744d7d751f2419;p=fdroidserver.git

GitLab CI: Java is required to set up the SDK
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ad80ad8..4b5acd51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,13 @@
 before_script:
   - apt-get -q update -y
   - echo " == Installing required packages"
-  - apt-get -q install -y python pyflakes pep8 dash bash ruby
+  - apt-get -q install -y wget tar lib32stdc++6 lib32z1
+      python pyflakes pep8 dash bash ruby
       python-imaging python-libcloud python-magic python-paramiko
       python-pyasn1 python-pyasn1-modules python-requests
+      rsync
+  - echo " == Installing OpenJDK 7"
+  - apt-get -q install -y openjdk-7-jdk
   - echo " == Installing the Android SDK"
   - wget -q -O android-sdk.tgz https://dl.google.com/android/android-sdk_r24.3.4-linux.tgz
   - tar -x -z -f android-sdk.tgz