diff --git a/next/Jenkinsfile b/next/Jenkinsfile index 589d003e2..651d1a746 100644 --- a/next/Jenkinsfile +++ b/next/Jenkinsfile @@ -61,7 +61,7 @@ spec: container('theia-dev') { withCredentials([string(credentialsId: "github-bot-token", variable: 'GITHUB_TOKEN')]) { script { - buildNext(false, 1200) + buildNext() } } } @@ -78,7 +78,7 @@ spec: } steps { script { - buildNext(false, 60) + buildNext() } } post { @@ -94,8 +94,8 @@ spec: steps { script { sh "npm config set msvs_version 2017" - sh "npx node-gyp install 14.20.0" - buildNext(true, 60) + sh "npx node-gyp@9.4.0 install 14.20.0" + buildNext() } } post { @@ -123,70 +123,89 @@ spec: } } -def buildNext(boolean runTests, int sleepBetweenRetries) { - int MAX_RETRY = 3 - - checkout scm - - // merge next branch into master to get any known fixes for next version - // TODO there might be a more elegant way to merge a branch into this one - // using a jenkings plugin from here +def buildNext() { sh "git config user.email \"not@real.user\"" sh "git config user.name \"Not a real user\"" - sh "git fetch origin next" - sh "git merge FETCH_HEAD" sh "node --version" + sh "pwd" - sh "export NODE_OPTIONS=--max_old_space_size=4096" + cleanWs() - // regular build - sh "printenv && yarn cache dir" + sh "ls -al" - sh "yarn cache clean" - try { - sh(script: 'yarn --frozen-lockfile --force') - } catch(error) { - retry(MAX_RETRY) { - sleep(sleepBetweenRetries) - echo "yarn failed - Retrying" - sh(script: 'yarn --frozen-lockfile --force') - } - } + sh "git clone https://github.com/eclipse-theia/theia.git" + sh "ls -al" - echo "Updating theia versions to next" - sh "yarn update:next" - try { - sh(script: 'yarn --force') - } catch(error) { - retry(MAX_RETRY) { - sleep(sleepBetweenRetries) - echo "yarn failed - Retrying" - sh(script: 'yarn --force') - } - } + sh "mkdir theia-blueprint && cd theia-blueprint" - echo "Upgrading versions" - sh "yarn upgrade" - sh "git clean -xfd" - try { - sh(script: 'yarn --force') - } catch(error) { - retry(MAX_RETRY) { - sleep(sleepBetweenRetries) - echo "yarn failed - Retrying" - sh(script: 'yarn --force') - } - } + checkout scm - sh "rm -rf ./${distFolder}" - sh "yarn build" - sh "yarn download:plugins" - sshagent(['projects-storage.eclipse.org-bot-ssh']) { - sh "yarn electron package:preview" - } - if (runTests) { - wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { - sh 'yarn electron test' - } - } + sh "cd .." + sh "ls -al" + + // int MAX_RETRY = 3 + + // checkout scm + + // // merge next branch into master to get any known fixes for next version + // // TODO there might be a more elegant way to merge a branch into this one + // // using a jenkings plugin from here + // sh "git config user.email \"not@real.user\"" + // sh "git config user.name \"Not a real user\"" + // sh "git fetch origin next" + // sh "git merge FETCH_HEAD" + // sh "node --version" + + // sh "export NODE_OPTIONS=--max_old_space_size=4096" + + // // regular build + // sh "printenv && yarn cache dir" + + // sh "yarn cache clean" + // try { + // sh(script: 'yarn --frozen-lockfile --force') + // } catch(error) { + // retry(MAX_RETRY) { + // sleep(sleepBetweenRetries) + // echo "yarn failed - Retrying" + // sh(script: 'yarn --frozen-lockfile --force') + // } + // } + + // echo "Updating theia versions to next" + // sh "yarn update:next" + // try { + // sh(script: 'yarn --force') + // } catch(error) { + // retry(MAX_RETRY) { + // sleep(sleepBetweenRetries) + // echo "yarn failed - Retrying" + // sh(script: 'yarn --force') + // } + // } + + // echo "Upgrading versions" + // sh "yarn upgrade" + // sh "git clean -xfd" + // try { + // sh(script: 'yarn --force') + // } catch(error) { + // retry(MAX_RETRY) { + // sleep(sleepBetweenRetries) + // echo "yarn failed - Retrying" + // sh(script: 'yarn --force') + // } + // } + + // sh "rm -rf ./${distFolder}" + // sh "yarn build" + // sh "yarn download:plugins" + // sshagent(['projects-storage.eclipse.org-bot-ssh']) { + // sh "yarn electron package:preview" + // } + // if (runTests) { + // wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { + // sh 'yarn electron test' + // } + // } }