Skip to content

Commit

Permalink
Update lerna and minimum node version
Browse files Browse the repository at this point in the history
- Update to lerna 6 and set node 14 as minimum engine version
eclipse-glsp/glsp#676
eclipse-glsp/glsp#680
- Update jenkins file to 
 - use the glsp-ci image
 - ensure that we don't exhaust resource limits
 - enable error reporting when master builds fail
eclipse-glsp/glsp#794

- Add missing @theia/cli dependency to yarn resolutions and regenerate yarn lock
  • Loading branch information
tortmayr committed Dec 5, 2022
1 parent 2d5654c commit 7bf177f
Show file tree
Hide file tree
Showing 3 changed files with 1,385 additions and 1,367 deletions.
45 changes: 38 additions & 7 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ kind: Pod
spec:
containers:
- name: node
image: eclipsetheia/theia-blueprint
image: eclipsetheia/alpine-v3.1
tty: true
resources:
limits:
memory: "4Gi"
cpu: "2"
memory: "2Gi"
cpu: "1"
requests:
memory: "4Gi"
cpu: "2"
memory: "2Gi"
cpu: "1"
command:
- cat
volumeMounts:
Expand Down Expand Up @@ -43,14 +43,15 @@ pipeline {
environment {
YARN_CACHE_FOLDER = "${env.WORKSPACE}/yarn-cache"
SPAWN_WRAP_SHIM_ROOT = "${env.WORKSPACE}"
EMAIL_TO= "[email protected]"
}

stages {
stage('Build') {
steps {
timeout(30) {
container('node') {
sh "yarn --ignore-engines --unsafe-perm"
sh "yarn --unsafe-perm"
}
}
}
Expand Down Expand Up @@ -78,7 +79,7 @@ pipeline {
}
}
steps {
build job: 'deploy-npm-glsp-theia-integration', wait: false
build job: 'deploy-npm-glsp-theia-integration', wait: true
}
}
}
Expand All @@ -90,5 +91,35 @@ pipeline {
tools: [esLint(pattern: 'node_modules/**/*/eslint.xml')],
qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]]
}
failure {
script {
if (env.BRANCH_NAME == 'master') {
echo "Build result FAILURE: Send email notification to ${EMAIL_TO}"
emailext attachLog: true,
body: 'Job: ${JOB_NAME}<br>Build Number: ${BUILD_NUMBER}<br>Build URL: ${BUILD_URL}',
mimeType: 'text/html', subject: 'Build ${JOB_NAME} (#${BUILD_NUMBER}) FAILURE', to: "${EMAIL_TO}"
}
}
}
unstable {
script {
if (env.BRANCH_NAME == 'master') {
echo "Build result UNSTABLE: Send email notification to ${EMAIL_TO}"
emailext attachLog: true,
body: 'Job: ${JOB_NAME}<br>Build Number: ${BUILD_NUMBER}<br>Build URL: ${BUILD_URL}',
mimeType: 'text/html', subject: 'Build ${JOB_NAME} (#${BUILD_NUMBER}) UNSTABLE', to: "${EMAIL_TO}"
}
}
}
fixed {
script {
if (env.BRANCH_NAME == 'master') {
echo "Build back to normal: Send email notification to ${EMAIL_TO}"
emailext attachLog: false,
body: 'Job: ${JOB_NAME}<br>Build Number: ${BUILD_NUMBER}<br>Build URL: ${BUILD_URL}',
mimeType: 'text/html', subject: 'Build ${JOB_NAME} back to normal (#${BUILD_NUMBER})', to: "${EMAIL_TO}"
}
}
}
}
}
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "1.0.0",
"engines": {
"yarn": ">=1.7.0 <2",
"node": ">=14.19.3"
"node": ">=14.18.0"
},
"scripts": {
"prepare": "lerna run prepare",
Expand All @@ -19,11 +19,11 @@
"download:exampleServer": "ts-node examples/workflow-theia/server/download.ts"
},
"devDependencies": {
"@eclipse-glsp/config": "1.0.0",
"@eclipse-glsp/config": "1.1.0-next.d03ad9f.112",
"@types/node": "14.x",
"lerna": "^5.5.4",
"lerna": "^6.1.0",
"rimraf": "^3.0.2",
"typescript": "~4.5.5"
"typescript": "^4.9.3"
},
"resolutions": {
"**/@theia/core": "1.29.1",
Expand All @@ -37,6 +37,7 @@
"**/@theia/process": "1.29.1",
"**/@theia/terminal": "1.29.1",
"**/@theia/workspace": "1.29.1",
"**/@theia/cli": "1.29.1",
"**/sprotty": "0.13.0-next.1c4343c.328"
},
"workspaces": [
Expand Down
Loading

0 comments on commit 7bf177f

Please sign in to comment.