You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by er...@apache.org on 2019/04/08 14:14:46 UTC

[cordova-plugin-camera] branch master updated: Update CI Environment Setup for Node.js 6 (#438)

This is an automated email from the ASF dual-hosted git repository.

erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-plugin-camera.git


The following commit(s) were added to refs/heads/master by this push:
     new fae190e  Update CI Environment Setup for Node.js 6 (#438)
fae190e is described below

commit fae190ead2a114dfe63b7045e75c36eb4b34ea00
Author: Gedas Gardauskas <ge...@gmail.com>
AuthorDate: Mon Apr 8 23:14:38 2019 +0900

    Update CI Environment Setup for Node.js 6 (#438)
---
 .appveyor.yml |  10 +++---
 .travis.yml   | 111 +++++++++++++++++++++++-----------------------------------
 2 files changed, 48 insertions(+), 73 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index a7b2426..72a4407 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -12,17 +12,17 @@ image:
   - Visual Studio 2017
 
 environment:
-  nodejs_version: "4"
+  nodejs_version: "6"
+
   matrix:
     - PLATFORM: windows-10-store
-      JUST_BUILD: --justBuild
+
 install:
-  - npm cache clean -f
   - node --version
-  - npm install -g cordova-paramedic@https://github.com/apache/cordova-paramedic.git
+  - npm install -g github:apache/cordova-paramedic
   - npm install -g cordova
 
 build: off
 
 test_script:
-  - cordova-paramedic --config pr\%PLATFORM% --plugin . %JUST_BUILD%
+  - cordova-paramedic --config pr\%PLATFORM% --plugin . --justBuild
diff --git a/.travis.yml b/.travis.yml
index f26a7a9..3ce07b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,96 +1,71 @@
 sudo: false
+
 addons:
   jwt:
     secure: QivPLlqTVvOo3TJeHxuBOfxU6lho1I0IxQ3b68yntkEQQJko6kzleXHfgjf0a8aw8m38E3+fxaBWF1bGyucGwOLDWY8Ddt2P2xg44zdXH5EXHd9oIqAgngIdzLvUtH3Db2TbQEtIGOkrnNR2STovjqB7vHGLASQrgs4oL7r32/s=
+
 env:
   global:
   - SAUCE_USERNAME=snay
-  - TRAVIS_NODE_VERSION="4.2"
+  - TRAVIS_NODE_VERSION=6
+
+language: node_js
+node_js: 6
+
 matrix:
   include:
   - env: TEST_DIR=.
     language: objective-c
+
   - env: TEST_DIR=./tests/ios
     language: objective-c
+
   - env: PLATFORM=browser-chrome
-    os: linux
-    language: node_js
-    node_js: '4.2'
   - env: PLATFORM=browser-firefox
-    os: linux
-    language: node_js
-    node_js: '4.2'
   - env: PLATFORM=browser-safari
-    os: linux
-    language: node_js
-    node_js: '4.2'
   - env: PLATFORM=browser-edge
-    os: linux
-    language: node_js
-    node_js: '4.2'
-  - env: PLATFORM=ios-9.3
-    os: osx
-    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"
-  - env: PLATFORM=android-4.4
-    os: linux
-    language: android
-    jdk: oraclejdk8
-    android:
-      components:
-      - tools
-      - extra-android-m2repository
-      - build-tools-26.0.2
-  - env: PLATFORM=android-5.1
-    os: linux
-    language: android
-    jdk: oraclejdk8
-    android:
-      components:
-      - tools
-      - extra-android-m2repository
-      - build-tools-26.0.2
-  - env: PLATFORM=android-6.0
-    os: linux
-    language: android
-    jdk: oraclejdk8
-    android:
-      components:
-      - tools
-      - extra-android-m2repository
-      - build-tools-26.0.2
+    osx_image: xcode9
+
   - env: PLATFORM=android-7.0
     os: linux
     language: android
     jdk: oraclejdk8
     android:
       components:
-      - tools
-      - extra-android-m2repository
-      - build-tools-26.0.2
+        - tools
+        - build-tools-28.0.3
+        - android-28
+        - extra-android-m2repository
+      licenses:
+        - 'android-sdk-preview-license-.+'
+        - 'android-sdk-license-.+'
+        - 'google-gdk-license-.+'
+
 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 install $TRAVIS_NODE_VERSION
-- node --version
-- if [[ "$PLATFORM" =~ android ]]; then gradle --version; 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;
-  fi
-- git clone https://github.com/apache/cordova-paramedic /tmp/paramedic && pushd /tmp/paramedic
-  && npm install && popd
-- 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;
+      gradle --version;
+    fi
+
+  - if [[ "$PLATFORM" =~ ios ]]; then
+      npm install -g ios-deploy;
+    fi
+
+  - npm install -g github:apache/cordova-paramedic
+  - npm install -g cordova
+
 install:
-- npm install
-script:
-- if [[ "$TEST_DIR" != "" ]];
-  then cd $TEST_DIR && npm install && npm test;
-  else
-  node /tmp/paramedic/main.js --config pr/$PLATFORM --plugin $(pwd) --shouldUseSauce
-  --buildName travis-plugin-camera-$TRAVIS_JOB_NUMBER;
-  fi
+  - npm install
 
+script:
+  - if [[ "$TEST_DIR" != "" ]]; then
+      cd $TEST_DIR;
+      npm install;
+      npm test;
+    else
+      cordova-paramedic --config pr/$PLATFORM --plugin . --shouldUseSauce --buildName travis-plugin-camera-$TRAVIS_JOB_NUMBER;
+    fi


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org