From f80efd42008ab1257a1f18f80d1aae417de0a5d5 Mon Sep 17 00:00:00 2001 From: mhutti1 Date: Thu, 27 Apr 2017 16:53:51 +0200 Subject: [PATCH 1/5] Fetch licenses from kiwix server --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ed79a8d14..7e604fc35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,11 @@ language: android jdk: oraclejdk8 -android: - components: - install: - pip install --user 'requests[security]' - mkdir $ANDROID_HOME/licenses - - wget -r -nH -nd -np -R index.html* mhutti1.eu/api/licenses/ -P $ANDROID_HOME/licenses + - wget -r -nH -nd -np -R index.html* robots.txt* http://download.kiwix.org/dev/android/api/licenses/ -e robots=off -P $ANDROID_HOME/licenses + before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ From d5ece49fa957ccf0f726144f6c5dba03b65aead1 Mon Sep 17 00:00:00 2001 From: mhutti1 Date: Thu, 27 Apr 2017 17:05:52 +0200 Subject: [PATCH 2/5] Removed unnesessary command --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7e604fc35..4c8f752aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ jdk: oraclejdk8 install: - pip install --user 'requests[security]' - - mkdir $ANDROID_HOME/licenses - wget -r -nH -nd -np -R index.html* robots.txt* http://download.kiwix.org/dev/android/api/licenses/ -e robots=off -P $ANDROID_HOME/licenses before_cache: From f8f4d38622880c697d1c20d5d3ae4350f3304e76 Mon Sep 17 00:00:00 2001 From: mhutti1 Date: Thu, 27 Apr 2017 17:33:25 +0200 Subject: [PATCH 3/5] Ignore IO error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4c8f752aa..7bc334b59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ jdk: oraclejdk8 install: - pip install --user 'requests[security]' - - wget -r -nH -nd -np -R index.html* robots.txt* http://download.kiwix.org/dev/android/api/licenses/ -e robots=off -P $ANDROID_HOME/licenses + - wget -r -nH -nd -np -R index.html* robots.txt* http://download.kiwix.org/dev/android/api/licenses/ -e robots=off -P $ANDROID_HOME/licenses || true before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock From 252f83bc794d15a22d5cdbd7f367b49b57676b2b Mon Sep 17 00:00:00 2001 From: mhutti1 Date: Thu, 27 Apr 2017 17:51:57 +0200 Subject: [PATCH 4/5] Test sudo config --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7bc334b59..2db8d71be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: android jdk: oraclejdk8 +sudo: required + install: - pip install --user 'requests[security]' - wget -r -nH -nd -np -R index.html* robots.txt* http://download.kiwix.org/dev/android/api/licenses/ -e robots=off -P $ANDROID_HOME/licenses || true From 6b045cb54463a0ea5ac7561a3cac19c090db7eda Mon Sep 17 00:00:00 2001 From: mhutti1 Date: Thu, 27 Apr 2017 18:12:53 +0200 Subject: [PATCH 5/5] Small test change --- app/src/main/res/values/styles.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b32e39e39..3135619ab 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -69,7 +69,6 @@ -