Skip to content

Commit fae190e

Browse files
GedasGaerisu
authored andcommitted
Update CI Environment Setup for Node.js 6 (#438)
1 parent a13665d commit fae190e

File tree

2 files changed

+48
-73
lines changed

2 files changed

+48
-73
lines changed

.appveyor.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ image:
1212
- Visual Studio 2017
1313

1414
environment:
15-
nodejs_version: "4"
15+
nodejs_version: "6"
16+
1617
matrix:
1718
- PLATFORM: windows-10-store
18-
JUST_BUILD: --justBuild
19+
1920
install:
20-
- npm cache clean -f
2121
- node --version
22-
- npm install -g cordova-paramedic@https://github.com/apache/cordova-paramedic.git
22+
- npm install -g github:apache/cordova-paramedic
2323
- npm install -g cordova
2424

2525
build: off
2626

2727
test_script:
28-
- cordova-paramedic --config pr\%PLATFORM% --plugin . %JUST_BUILD%
28+
- cordova-paramedic --config pr\%PLATFORM% --plugin . --justBuild

.travis.yml

Lines changed: 43 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,71 @@
11
sudo: false
2+
23
addons:
34
jwt:
45
secure: QivPLlqTVvOo3TJeHxuBOfxU6lho1I0IxQ3b68yntkEQQJko6kzleXHfgjf0a8aw8m38E3+fxaBWF1bGyucGwOLDWY8Ddt2P2xg44zdXH5EXHd9oIqAgngIdzLvUtH3Db2TbQEtIGOkrnNR2STovjqB7vHGLASQrgs4oL7r32/s=
6+
57
env:
68
global:
79
- SAUCE_USERNAME=snay
8-
- TRAVIS_NODE_VERSION="4.2"
10+
- TRAVIS_NODE_VERSION=6
11+
12+
language: node_js
13+
node_js: 6
14+
915
matrix:
1016
include:
1117
- env: TEST_DIR=.
1218
language: objective-c
19+
1320
- env: TEST_DIR=./tests/ios
1421
language: objective-c
22+
1523
- env: PLATFORM=browser-chrome
16-
os: linux
17-
language: node_js
18-
node_js: '4.2'
1924
- env: PLATFORM=browser-firefox
20-
os: linux
21-
language: node_js
22-
node_js: '4.2'
2325
- env: PLATFORM=browser-safari
24-
os: linux
25-
language: node_js
26-
node_js: '4.2'
2726
- env: PLATFORM=browser-edge
28-
os: linux
29-
language: node_js
30-
node_js: '4.2'
31-
- env: PLATFORM=ios-9.3
32-
os: osx
33-
osx_image: xcode7.3
34-
language: node_js
35-
node_js: "4.2"
27+
3628
- env: PLATFORM=ios-10.0
3729
os: osx
38-
osx_image: xcode7.3
39-
language: node_js
40-
node_js: "4.2"
41-
- env: PLATFORM=android-4.4
42-
os: linux
43-
language: android
44-
jdk: oraclejdk8
45-
android:
46-
components:
47-
- tools
48-
- extra-android-m2repository
49-
- build-tools-26.0.2
50-
- env: PLATFORM=android-5.1
51-
os: linux
52-
language: android
53-
jdk: oraclejdk8
54-
android:
55-
components:
56-
- tools
57-
- extra-android-m2repository
58-
- build-tools-26.0.2
59-
- env: PLATFORM=android-6.0
60-
os: linux
61-
language: android
62-
jdk: oraclejdk8
63-
android:
64-
components:
65-
- tools
66-
- extra-android-m2repository
67-
- build-tools-26.0.2
30+
osx_image: xcode9
31+
6832
- env: PLATFORM=android-7.0
6933
os: linux
7034
language: android
7135
jdk: oraclejdk8
7236
android:
7337
components:
74-
- tools
75-
- extra-android-m2repository
76-
- build-tools-26.0.2
38+
- tools
39+
- build-tools-28.0.3
40+
- android-28
41+
- extra-android-m2repository
42+
licenses:
43+
- 'android-sdk-preview-license-.+'
44+
- 'android-sdk-license-.+'
45+
- 'google-gdk-license-.+'
46+
7747
before_install:
78-
- 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
79-
- node --version
80-
- if [[ "$PLATFORM" =~ android ]]; then gradle --version; fi
81-
- if [[ "$PLATFORM" =~ ios ]]; then npm install -g ios-deploy; fi
82-
- if [[ "$PLATFORM" =~ android ]]; then echo y | android update sdk -u --filter android-22,android-23,android-24,android-25,android-26,android-27;
83-
fi
84-
- git clone https://github.com/apache/cordova-paramedic /tmp/paramedic && pushd /tmp/paramedic
85-
&& npm install && popd
86-
- npm install -g cordova
48+
# `language: android` has no Node.js installed, therefore we need to install it manually
49+
- if [[ "$PLATFORM" =~ android ]]; then
50+
nvm install $TRAVIS_NODE_VERSION;
51+
gradle --version;
52+
fi
53+
54+
- if [[ "$PLATFORM" =~ ios ]]; then
55+
npm install -g ios-deploy;
56+
fi
57+
58+
- npm install -g github:apache/cordova-paramedic
59+
- npm install -g cordova
60+
8761
install:
88-
- npm install
89-
script:
90-
- if [[ "$TEST_DIR" != "" ]];
91-
then cd $TEST_DIR && npm install && npm test;
92-
else
93-
node /tmp/paramedic/main.js --config pr/$PLATFORM --plugin $(pwd) --shouldUseSauce
94-
--buildName travis-plugin-camera-$TRAVIS_JOB_NUMBER;
95-
fi
62+
- npm install
9663

64+
script:
65+
- if [[ "$TEST_DIR" != "" ]]; then
66+
cd $TEST_DIR;
67+
npm install;
68+
npm test;
69+
else
70+
cordova-paramedic --config pr/$PLATFORM --plugin . --shouldUseSauce --buildName travis-plugin-camera-$TRAVIS_JOB_NUMBER;
71+
fi

0 commit comments

Comments
 (0)