Skip to content

Commit

Permalink
Merge branch 'master' into feature/windows-build
Browse files Browse the repository at this point in the history
  • Loading branch information
v1v authored Oct 14, 2019
2 parents da21916 + 1b825ef commit 9c4bf41
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ pipeline {
script {
def node = readYaml(file: '.ci/.jenkins_nodejs.yml')
def parallelTasks = [:]
def parallelTasksWithoutAsyncHooks = [:]
node['NODEJS_VERSION'].each{ version ->
parallelTasks["Node.js-${version}"] = generateStep(version: version)
parallelTasks["Node.js-${version}-async-hooks-false"] = generateStep(version: version, disableAsyncHooks: true)
Expand Down Expand Up @@ -203,7 +202,7 @@ pipeline {
}
}
stage('RC Test') {
agent { label 'linux && immutablee' }
agent { label 'linux && immutable' }
environment {
NVM_NODEJS_ORG_MIRROR = "https://nodejs.org/download/rc/"
}
Expand Down

0 comments on commit 9c4bf41

Please sign in to comment.