From eb245ecaf7362f7e2c8b29f4aa4f4442bd2cecc4 Mon Sep 17 00:00:00 2001 From: "Christopher J. Brody" Date: Tue, 31 Jul 2018 16:54:01 -0400 Subject: [PATCH 1/5] .travis.yml add blank lines --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6098fe331..a8220a1cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,14 @@ sudo: false + addons: jwt: secure: TZ88IEvAw1bsWPWxvDzXdpi2NK0i3PN4hG15+vDpIt6wXGVPknjxuXWJeLj7TqBpAIvP7XDfS8ZvHVPLe7fe8oOchZPLuiDw9VVIk6cnHjE6wpoavdGc/1mDJ3Bi4PDcHwRUr5ng5spYQqqlTwcECkH/q7iPgudiFM6rlOlGRyA= + env: global: - SAUCE_USERNAME=snay - TRAVIS_NODE_VERSION="4.2" + matrix: include: - env: PLATFORM=browser-chrome @@ -74,6 +77,7 @@ matrix: - platform-tools - tools - build-tools-26.0.2 + before_install: - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm @@ -86,8 +90,10 @@ before_install: - git clone https://github.com/apache/cordova-paramedic /tmp/paramedic && pushd /tmp/paramedic && npm install && popd - npm install -g cordova + install: - npm install + script: - npm test - node /tmp/paramedic/main.js --config pr/$PLATFORM --plugin $(pwd) --shouldUseSauce From e75fe14c4ba01403c85c8f6a600d879af06c681f Mon Sep 17 00:00:00 2001 From: "Christopher J. Brody" Date: Tue, 31 Jul 2018 18:03:47 -0400 Subject: [PATCH 2/5] .appveyor.yml add npm i & add eslint to test (consistent with test script in package.json) --- .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index a7b2426e0..80e8353c9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,8 +21,10 @@ install: - node --version - npm install -g cordova-paramedic@https://github.com/apache/cordova-paramedic.git - npm install -g cordova + - npm install build: off test_script: + - npm run eslint - cordova-paramedic --config pr\%PLATFORM% --plugin . %JUST_BUILD% From a464ea6875142744a310d418a9d8d92f5d4097b4 Mon Sep 17 00:00:00 2001 From: "Christopher J. Brody" Date: Tue, 31 Jul 2018 19:02:30 -0400 Subject: [PATCH 3/5] .travis.yml quick fixes - skip some platform versions for now - mark FUTURE TBD platform versions --- .travis.yml | 68 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index a8220a1cd..c0f35815c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,11 @@ matrix: os: linux language: node_js node_js: '4.2' - - env: PLATFORM=browser-safari - os: linux - language: node_js - node_js: '4.2' + # TBD SKIP for now: + # - env: PLATFORM=browser-safari + # os: linux + # language: node_js + # node_js: '4.2' - env: PLATFORM=browser-edge os: linux language: node_js @@ -32,11 +33,15 @@ matrix: osx_image: xcode7.3 language: node_js node_js: '4.2' - - env: PLATFORM=ios-10.0 - os: osx - osx_image: xcode7.3 - language: node_js - node_js: '4.2' + # TBD SKIP for now: + # - env: PLATFORM=ios-10.0 + # os: osx + # osx_image: xcode7.3 + # language: node_js + # node_js: '4.2' + # FUTURE TBD: + # - env: PLATFORM=ios-11.4 + # ... - env: PLATFORM=android-4.4 os: linux language: android @@ -47,16 +52,17 @@ matrix: - platform-tools - tools - build-tools-26.0.2 - - env: PLATFORM=android-5.1 - os: linux - language: android - jdk: oraclejdk8 - android: - components: - - tools - - platform-tools - - tools - - build-tools-26.0.2 + # TBD SKIP for now: + # - env: PLATFORM=android-5.1 + # os: linux + # language: android + # jdk: oraclejdk8 + # android: + # components: + # - tools + # - platform-tools + # - tools + # - build-tools-26.0.2 - env: PLATFORM=android-6.0 os: linux language: android @@ -67,16 +73,20 @@ matrix: - platform-tools - tools - build-tools-26.0.2 - - env: PLATFORM=android-7.0 - os: linux - language: android - jdk: oraclejdk8 - android: - components: - - tools - - platform-tools - - tools - - build-tools-26.0.2 + # TBD SKIP for now: + # - env: PLATFORM=android-7.0 + # os: linux + # language: android + # jdk: oraclejdk8 + # android: + # components: + # - tools + # - platform-tools + # - tools + # - build-tools-26.0.2 + # FUTURE TBD: + # - env: PLATFORM=android-8.? + # ... before_install: - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm From 81f1437b6da838031611ad8cb05294929c49bf57 Mon Sep 17 00:00:00 2001 From: "Christopher J. Brody" Date: Tue, 31 Jul 2018 19:05:28 -0400 Subject: [PATCH 4/5] README.md add AppVeyor CI & Travis CI details --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 26ed518f5..f3e567acf 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,11 @@ description: Open an in-app browser window. |AppVeyor|Travis CI| |:-:|:-:| |[![Build status](https://ci.appveyor.com/api/projects/status/github/apache/cordova-plugin-inappbrowser?branch=master)](https://ci.appveyor.com/project/ApacheSoftwareFoundation/cordova-plugin-inappbrowser)|[![Build Status](https://travis-ci.org/apache/cordova-plugin-inappbrowser.svg?branch=master)](https://travis-ci.org/apache/cordova-plugin-inappbrowser)| +|npm install|npm install| +|eslint|eslint| +||browser (chrome, firefox, edge)| +||iOS (9.3) on Xcode 7.3| +||Android (4.4, 6.0)| # cordova-plugin-inappbrowser From 07d9a9939b4a10bd6c323565fc356628942db8ba Mon Sep 17 00:00:00 2001 From: "Christopher J. Brody" Date: Tue, 31 Jul 2018 19:18:29 -0400 Subject: [PATCH 5/5] Skip Android 6.0 on Travis CI (for now) --- .travis.yml | 21 ++++++++++----------- README.md | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0f35815c..00def860b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,17 +63,16 @@ matrix: # - platform-tools # - tools # - build-tools-26.0.2 - - env: PLATFORM=android-6.0 - os: linux - language: android - jdk: oraclejdk8 - android: - components: - - tools - - platform-tools - - tools - - build-tools-26.0.2 - # TBD SKIP for now: + # - env: PLATFORM=android-6.0 + # os: linux + # language: android + # jdk: oraclejdk8 + # android: + # components: + # - tools + # - platform-tools + # - tools + # - build-tools-26.0.2 # - env: PLATFORM=android-7.0 # os: linux # language: android diff --git a/README.md b/README.md index f3e567acf..eade58a37 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ description: Open an in-app browser window. |eslint|eslint| ||browser (chrome, firefox, edge)| ||iOS (9.3) on Xcode 7.3| -||Android (4.4, 6.0)| +||Android (4.4)| # cordova-plugin-inappbrowser