From 5197636f7000f55b00987f312a41dbb7657119c6 Mon Sep 17 00:00:00 2001 From: tux-mind Date: Mon, 19 Jun 2017 23:51:49 +0200 Subject: [PATCH 1/8] [CI] skip cleanup and refactoring of installation --- .travis.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ce626c..c6ab70c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,19 +32,15 @@ install: - nvm install 8.1.1 - nvm use 8.1.1 - npm install -g npm - - cd app - - npm cache clean - - npm install - npm install -g cordova - echo y | android update sdk --no-ui --all --filter android-24 + +script: + - cd app + - npm install - npm run build - cd .. - -before_script: - - cordova platform rm android - cordova platform add android - -script: - cordova prepare - cordova build android --release -- --ant From 5a25d608da6f21edf8b3d02509b47d58ddaf699b Mon Sep 17 00:00:00 2001 From: tux-mind Date: Mon, 19 Jun 2017 23:55:37 +0200 Subject: [PATCH 2/8] [CI] build all the branches! --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c6ab70c..74c3386 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,6 @@ notifications: rooms: - csploit:BYr15dcnal0Dm6UZRafBqWSC#travis -branches: - only: - - master - install: - nvm install 8.1.1 - nvm use 8.1.1 From bd28c853c53f0724a4c34d89638873a41ee55a3a Mon Sep 17 00:00:00 2001 From: tux-mind Date: Tue, 20 Jun 2017 00:13:48 +0200 Subject: [PATCH 3/8] [CI] use new build instructions --- .travis.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74c3386..5834488 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,6 @@ android: - platform-tools - build-tools-24.0.2 - android-24 -node_js: - - "8.1.1" jdk: - oraclejdk8 @@ -27,18 +25,11 @@ notifications: install: - nvm install 8.1.1 - nvm use 8.1.1 - - npm install -g npm - - npm install -g cordova - - echo y | android update sdk --no-ui --all --filter android-24 script: - - cd app - npm install - npm run build - - cd .. - - cordova platform add android - - cordova prepare - - cordova build android --release -- --ant + - npm run android release: - exit 0 From 11aa72f30a701f3178e418a603cbaaa6e34a3001 Mon Sep 17 00:00:00 2001 From: tux-mind Date: Tue, 20 Jun 2017 00:23:52 +0200 Subject: [PATCH 4/8] [CI] fake accept license --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5834488..a787c53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ notifications: install: - nvm install 8.1.1 - nvm use 8.1.1 + - echo y | android update sdk --no-ui --all --filter android-24 script: - npm install From a13ba2b65cf46e1dbe43b8ef4ec41a813580473c Mon Sep 17 00:00:00 2001 From: tux-mind Date: Tue, 20 Jun 2017 00:36:48 +0200 Subject: [PATCH 5/8] [CI] use SDK version 25 --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a787c53..95759ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ android: - tools # to get the new `repository-11.xml` - tools # see https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943) - platform-tools - - build-tools-24.0.2 - - android-24 + - build-tools-25.0.2 + - android-25 jdk: - oraclejdk8 @@ -25,7 +25,6 @@ notifications: install: - nvm install 8.1.1 - nvm use 8.1.1 - - echo y | android update sdk --no-ui --all --filter android-24 script: - npm install From b85db008656706f1eade7a6486789fced6fe2fde Mon Sep 17 00:00:00 2001 From: tux-mind Date: Tue, 20 Jun 2017 00:59:02 +0200 Subject: [PATCH 6/8] [CI] accept support repo license --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 95759ea..558550c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ android: - platform-tools - build-tools-25.0.2 - android-25 + - extra-android-support jdk: - oraclejdk8 From 3633e803a1dd229c90129f8bd0732348f7aab65c Mon Sep 17 00:00:00 2001 From: tux-mind Date: Tue, 20 Jun 2017 01:11:06 +0200 Subject: [PATCH 7/8] [CI] use new component name --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 558550c..75b38c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ android: - platform-tools - build-tools-25.0.2 - android-25 - - extra-android-support + - extra-android-m2repository jdk: - oraclejdk8 From 7c5dad4fbf1800aa91c36ea33d3163b6323d1818 Mon Sep 17 00:00:00 2001 From: tux-mind Date: Tue, 20 Jun 2017 20:14:35 +0200 Subject: [PATCH 8/8] [CI] do not run on android on travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 75b38c3..a1d573c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,6 @@ install: script: - npm install - npm run build - - npm run android release: - exit 0