cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1915 from nmikhailov/travis_fix

Browse Source 
Fix travis android-24 dep
This commit is contained in:
Dominik Schürmann
2016-08-18 20:41:11 +02:00
committed by GitHub
parent 4d5c18b0b6 217f6ce490
commit db888140d2
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@@ -1,5 +1,5 @@
language: android language: android
jdk: openjdk7 #jdk: oraclejdk8
env: env:
- TEST=unit - TEST=unit
- TEST=android ANDROID_TARGET=android-21 ANDROID_ABI=armeabi-v7a ADB_INSTALL_TIMEOUT=10 - TEST=android ANDROID_TARGET=android-21 ANDROID_ABI=armeabi-v7a ADB_INSTALL_TIMEOUT=10
@@ -13,6 +13,12 @@ sudo: required
# hostname: short-hostname # hostname: short-hostname
# workaround from https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913 # workaround from https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913
before_install: before_install:
- sudo add-apt-repository ppa:openjdk-r/ppa -y
- sudo apt-get update
- sudo apt-get install -y openjdk-8-jdk
- sudo update-alternatives --auto java
- sudo update-alternatives --auto javac
- export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
- cat /etc/hosts # optionally check the content *before* - cat /etc/hosts # optionally check the content *before*
- sudo hostname "$(hostname | cut -c1-63)" - sudo hostname "$(hostname | cut -c1-63)"
- sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
@@ -20,10 +26,11 @@ before_install:
android: android:
components: components:
- tools
- tools # Per https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943
- android-22 - android-22
- android-23 - android-23
- android-24 - android-24
- tools
- platform-tools - platform-tools
- build-tools-23.0.2 - build-tools-23.0.2
- build-tools-24.0.1 - build-tools-24.0.1