diff --git a/Jenkinsfile b/Jenkinsfile index 829bf6e190..2a8a8aa4fc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,7 @@ echo flags stage('Build') { parallel linux: { node('linux') { - timeout(time: 45, unit: 'MINUTES') { + timeout(time: 90, unit: 'MINUTES') { deleteDir() checkout scm @@ -43,7 +43,7 @@ stage('Build') { }, windows: { node('windows') { - timeout(time: 45, unit: 'MINUTES') { + timeout(time: 90, unit: 'MINUTES') { // We specify the workspace directory manually to reduce the path length and thus try to avoid MSB3491 on Visual Studio ws("C:/J/O/${env.BRANCH_NAME}") { deleteDir() @@ -62,7 +62,7 @@ stage('Build') { }, osx: { node('osx') { - timeout(time: 45, unit: 'MINUTES') { + timeout(time: 90, unit: 'MINUTES') { deleteDir() checkout scm sh 'git submodule update --init --recursive' diff --git a/scripts/configuration_helper.lua b/scripts/configuration_helper.lua index a0767db7ab..5268e0d35a 100644 --- a/scripts/configuration_helper.lua +++ b/scripts/configuration_helper.lua @@ -1,4 +1,4 @@ --- shared: Determines whether the contents of the window should be shared using the SPOUT library [example: shared=true] {default: false}-- Helper functions that are useful to customize the openspace.cfg loading +-- Helper functions that are useful to customize the openspace.cfg loading --[[ ##########################################################################################