You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ja...@apache.org on 2019/03/29 14:42:07 UTC
[cordova-paramedic] 01/01: different way to accept android licences
remove sauceAppiumVersion from configs add more (already existing and new)
OS/version combinations
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-improve_ci_android
in repository https://gitbox.apache.org/repos/asf/cordova-paramedic.git
commit 7a63eb9462e8938021a2c89c88da94e593d95fd0
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Fri Mar 29 15:41:53 2019 +0100
different way to accept android licences
remove sauceAppiumVersion from configs
add more (already existing and new) OS/version combinations
---
.travis.yml | 130 +++++++++++++++++----
conf/periodic/android-6.0.config.json | 1 -
conf/periodic/android-7.0.config.json | 1 -
conf/pr/android-6.0.config.json | 1 -
conf/pr/android-7.0.config.json | 1 -
...oid-7.0.config.json => android-7.1.config.json} | 3 +-
...oid-7.0.config.json => android-8.0.config.json} | 3 +-
...oid-7.0.config.json => android-8.1.config.json} | 3 +-
lib/ParamedicConfig.js | 4 +-
9 files changed, 112 insertions(+), 35 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a2c4773..ff2cc4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ env:
global:
- SAUCE_USERNAME=snay
- TRAVIS_NODE_VERSION=6
+ - ANDROID_API_LEVEL=28
+ - ANDROID_BUILD_TOOLS_VERSION=28.0.3
language: node_js
node_js: 6
@@ -21,30 +23,112 @@ matrix:
- env: PLATFORM=ios-10.0
os: osx
osx_image: xcode9
- - env: PLATFORM=android-7.0
- os: linux
- language: android
- jdk: oraclejdk8
- android:
- components:
- - tools
- - extra-android-m2repository
- - build-tools-28.0.3
+ - env: PLATFORM=android-4.4
+ os: linux
+ language: android
+ jdk: oraclejdk8
+ android:
+ components:
+ - tools
+ - build-tools-$ANDROID_BUILD_TOOLS_VERSION
+ - android-$ANDROID_API_LEVEL
+ licenses:
+ - 'android-sdk-preview-license-.+'
+ - 'android-sdk-license-.+'
+ - 'google-gdk-license-.+'
+ - env: PLATFORM=android-5.1
+ os: linux
+ language: android
+ jdk: oraclejdk8
+ android:
+ components:
+ - tools
+ - build-tools-$ANDROID_BUILD_TOOLS_VERSION
+ - android-$ANDROID_API_LEVEL
+ licenses:
+ - 'android-sdk-preview-license-.+'
+ - 'android-sdk-license-.+'
+ - 'google-gdk-license-.+'
+ - env: PLATFORM=android-6.0
+ os: linux
+ language: android
+ jdk: oraclejdk8
+ android:
+ components:
+ - tools
+ - build-tools-$ANDROID_BUILD_TOOLS_VERSION
+ - android-$ANDROID_API_LEVEL
+ licenses:
+ - 'android-sdk-preview-license-.+'
+ - 'android-sdk-license-.+'
+ - 'google-gdk-license-.+'
+ - env: PLATFORM=android-7.0
+ os: linux
+ language: android
+ jdk: oraclejdk8
+ android:
+ components:
+ - tools
+ - build-tools-$ANDROID_BUILD_TOOLS_VERSION
+ - android-$ANDROID_API_LEVEL
+ licenses:
+ - 'android-sdk-preview-license-.+'
+ - 'android-sdk-license-.+'
+ - 'google-gdk-license-.+'
+ - env: PLATFORM=android-7.1
+ os: linux
+ language: android
+ jdk: oraclejdk8
+ android:
+ components:
+ - tools
+ - build-tools-$ANDROID_BUILD_TOOLS_VERSION
+ - android-$ANDROID_API_LEVEL
+ licenses:
+ - 'android-sdk-preview-license-.+'
+ - 'android-sdk-license-.+'
+ - 'google-gdk-license-.+'
+ - env: PLATFORM=android-8.0
+ os: linux
+ language: android
+ jdk: oraclejdk8
+ android:
+ components:
+ - tools
+ - build-tools-$ANDROID_BUILD_TOOLS_VERSION
+ - android-$ANDROID_API_LEVEL
+ licenses:
+ - 'android-sdk-preview-license-.+'
+ - 'android-sdk-license-.+'
+ - 'google-gdk-license-.+'
+ - env: PLATFORM=android-8.1
+ os: linux
+ language: android
+ jdk: oraclejdk8
+ android:
+ components:
+ - tools
+ - build-tools-$ANDROID_BUILD_TOOLS_VERSION
+ - android-$ANDROID_API_LEVEL
+ licenses:
+ - 'android-sdk-preview-license-.+'
+ - 'android-sdk-license-.+'
+ - 'google-gdk-license-.+'
+
before_install:
-# `language: android` has no Node.js installed, therefore we need to install it manually
-- if [[ "$PLATFORM" =~ android ]]; then nvm install $TRAVIS_NODE_VERSION; fi
-- node --version
-- if [[ "$PLATFORM" =~ android ]]; then gradle --version; fi
-- if [[ "$PLATFORM" =~ local ]]; then npm install -g ios-deploy; fi
-- if [[ "$PLATFORM" =~ ios ]]; then npm install -g ios-deploy; fi
-- if [[ "$PLATFORM" =~ android ]]; then echo y | android update sdk -u --filter android-22,android-23,android-24,android-25,android-26,android-27,android-28;
- fi
-- npm install -g cordova
+ # `language: android` has no Node.js installed, therefore we need to install it manually
+ - if [[ "$PLATFORM" =~ android ]]; then nvm install $TRAVIS_NODE_VERSION; fi
+ - node --version
+ - if [[ "$PLATFORM" =~ local ]]; then npm install -g ios-deploy; fi
+ - if [[ "$PLATFORM" =~ android ]]; then gradle --version; fi
+ - if [[ "$PLATFORM" =~ ios ]]; then npm install -g ios-deploy; fi
+ - npm install -g cordova
install:
-- npm install
+ - npm install
script:
-- if [[ "$PLATFORM" =~ local ]]; then npm run test-browser; fi
-- if [[ "$PLATFORM" =~ local ]]; then npm run test-ios; fi
-- if [[ "$PLATFORM" =~ TODO ]]; then npm run test-android; fi
-- if [[ "$PLATFORM" != local ]]; then node main.js --config ./pr/$PLATFORM --plugin ./spec/testable-plugin/ --shouldUseSauce --buildName travis-paramedic-$TRAVIS_JOB_NUMBER; fi
+ - if [[ "$PLATFORM" =~ local ]]; then npm run test-browser; fi
+ - if [[ "$PLATFORM" =~ local ]]; then npm run test-ios; fi
+ - if [[ "$PLATFORM" =~ TODO ]]; then npm run test-android; fi
+ - if [[ "$PLATFORM" != local ]]; then node main.js --config ./pr/$PLATFORM --plugin ./spec/testable-plugin/ --shouldUseSauce --buildName travis-paramedic-$TRAVIS_JOB_NUMBER; fi
+
diff --git a/conf/periodic/android-6.0.config.json b/conf/periodic/android-6.0.config.json
index fd7b744..9c6e80b 100644
--- a/conf/periodic/android-6.0.config.json
+++ b/conf/periodic/android-6.0.config.json
@@ -3,6 +3,5 @@
"action": "run",
"cleanUpAfterRun": true,
"saucePlatformVersion": "6.0",
- "sauceAppiumVersion": "1.6.4",
"verbose": true
}
diff --git a/conf/periodic/android-7.0.config.json b/conf/periodic/android-7.0.config.json
index 0cea7b2..9037cbb 100644
--- a/conf/periodic/android-7.0.config.json
+++ b/conf/periodic/android-7.0.config.json
@@ -3,7 +3,6 @@
"action": "run",
"cleanUpAfterRun": true,
"saucePlatformVersion": "7.0",
- "sauceAppiumVersion": "1.6.4",
"sauceDeviceName": "Android GoogleAPI Emulator",
"verbose": true
}
diff --git a/conf/pr/android-6.0.config.json b/conf/pr/android-6.0.config.json
index 9aa2404..3651091 100644
--- a/conf/pr/android-6.0.config.json
+++ b/conf/pr/android-6.0.config.json
@@ -3,6 +3,5 @@
"action": "run",
"cleanUpAfterRun": true,
"saucePlatformVersion": "6.0",
- "sauceAppiumVersion": "1.6.4",
"verbose": true
}
diff --git a/conf/pr/android-7.0.config.json b/conf/pr/android-7.0.config.json
index 02d6a7b..0e31612 100644
--- a/conf/pr/android-7.0.config.json
+++ b/conf/pr/android-7.0.config.json
@@ -3,7 +3,6 @@
"action": "run",
"cleanUpAfterRun": true,
"saucePlatformVersion": "7.0",
- "sauceAppiumVersion": "1.6.4",
"sauceDeviceName": "Android GoogleAPI Emulator",
"verbose": true
}
diff --git a/conf/pr/android-7.0.config.json b/conf/pr/android-7.1.config.json
similarity index 68%
copy from conf/pr/android-7.0.config.json
copy to conf/pr/android-7.1.config.json
index 02d6a7b..9f677d1 100644
--- a/conf/pr/android-7.0.config.json
+++ b/conf/pr/android-7.1.config.json
@@ -2,8 +2,7 @@
"platform": "android",
"action": "run",
"cleanUpAfterRun": true,
- "saucePlatformVersion": "7.0",
- "sauceAppiumVersion": "1.6.4",
+ "saucePlatformVersion": "7.1",
"sauceDeviceName": "Android GoogleAPI Emulator",
"verbose": true
}
diff --git a/conf/pr/android-7.0.config.json b/conf/pr/android-8.0.config.json
similarity index 68%
copy from conf/pr/android-7.0.config.json
copy to conf/pr/android-8.0.config.json
index 02d6a7b..4cb7193 100644
--- a/conf/pr/android-7.0.config.json
+++ b/conf/pr/android-8.0.config.json
@@ -2,8 +2,7 @@
"platform": "android",
"action": "run",
"cleanUpAfterRun": true,
- "saucePlatformVersion": "7.0",
- "sauceAppiumVersion": "1.6.4",
+ "saucePlatformVersion": "8.0",
"sauceDeviceName": "Android GoogleAPI Emulator",
"verbose": true
}
diff --git a/conf/pr/android-7.0.config.json b/conf/pr/android-8.1.config.json
similarity index 68%
copy from conf/pr/android-7.0.config.json
copy to conf/pr/android-8.1.config.json
index 02d6a7b..44ad3ce 100644
--- a/conf/pr/android-7.0.config.json
+++ b/conf/pr/android-8.1.config.json
@@ -2,8 +2,7 @@
"platform": "android",
"action": "run",
"cleanUpAfterRun": true,
- "saucePlatformVersion": "7.0",
- "sauceAppiumVersion": "1.6.4",
+ "saucePlatformVersion": "8.1",
"sauceDeviceName": "Android GoogleAPI Emulator",
"verbose": true
}
diff --git a/lib/ParamedicConfig.js b/lib/ParamedicConfig.js
index 10bf545..5ed776d 100644
--- a/lib/ParamedicConfig.js
+++ b/lib/ParamedicConfig.js
@@ -20,8 +20,8 @@
var DEFAULT_START_PORT = 7008;
var DEFAULT_END_PORT = 7208;
var DEFAULT_TIMEOUT = 60 * 60 * 1000; // 60 minutes in msec - this will become a param
-var DEFAULT_SAUCE_DEVICE_NAME_ANDROID = 'Android Emulator';
-var DEFAULT_SAUCE_PLATFORM_VERSION_ANDROID = '4.4';
+var DEFAULT_SAUCE_DEVICE_NAME_ANDROID = 'Android GoogleAPI Emulator';
+var DEFAULT_SAUCE_PLATFORM_VERSION_ANDROID = '8.0';
var DEFAULT_SAUCE_DEVICE_NAME_IOS = 'iPhone Simulator';
var DEFAULT_SAUCE_PLATFORM_VERSION_IOS = '9.3';
var DEFAULT_SAUCE_APPIUM_VERSION = '1.6.3';
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org