Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

feat(build): updating supported Node.js versions for CI #1768

Merged
merged 6 commits into from
Jun 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
language: node_js
sudo: false
node_js:
- 4
- 5
- 6
- 7
matrix:
allow_failures:
- node_js: 7
- '6.10'
- '7'
#matrix:
# allow_failures:
# - node_js: 7
os:
- linux
- centos
Expand All @@ -30,8 +28,11 @@ addons:
before_install:
- npm i nsp -g
- npm i snyk -g
- export DISPLAY=:99.0
- bash scripts/setup-protractor.sh
- npm install protractor
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- 'node_modules/protractor/bin/webdriver-manager update --standalone --firefox'
- 'node_modules/protractor/bin/webdriver-manager start 2>&1 &'
- sleep 3
#before_script:
# - snyk auth $SNYK_TOKEN
Expand Down
29 changes: 1 addition & 28 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -388,40 +388,13 @@ gulp.task('dropdb', function (done) {
// Downloads the selenium webdriver if protractor version is compatible
gulp.task('webdriver_update', webdriver_update);

gulp.task('webdriver_prep', function(done) {
runSequence('protractor_prep', 'webdriver_update', done);
});

gulp.task('protractor_prep', function() {
var nodeVersions = process.versions;
switch (nodeVersions.node.substr(0, 1)) {
case '4':
case '5':
console.log('E2E testing doesnt support v4 and v5');
process.exit(0);
break;
case '6':
if (parseInt(nodeVersions.node.substr(1, 1), 10) < 9) {
console.log('E2E testing with latest protractor requires v >= 6.9 ');
process.exit(0);
}
break;
default:
console.log('Detecting support for protractor E2E tests');
break;
}

return gulp.src('*.js');
});


// Start the standalone selenium server
// NOTE: This is not needed if you reference the
// seleniumServerJar in your protractor.conf.js
gulp.task('webdriver_standalone', webdriver_standalone);

// Protractor test runner task
gulp.task('protractor', ['webdriver_prep'], function () {
gulp.task('protractor', ['webdriver_update'], function () {
gulp.src([])
.pipe(protractor({
configFile: 'protractor.conf.js'
Expand Down
11 changes: 0 additions & 11 deletions scripts/setup-protractor.sh

This file was deleted.