Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update examples #162

Merged
merged 2 commits into from
Dec 8, 2022
Merged

Update examples #162

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
350b933
Update examples
tortmayr Dec 6, 2022
e356435
Address review feedback
tortmayr Dec 7, 2022
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
33 changes: 32 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: Pod
spec:
containers:
- name: ci
image: eclipseglsp/ci:alpine
image: eclipseglsp/ci:alpine-v3.1
tty: true
resources:
limits:
Expand Down Expand Up @@ -59,6 +59,7 @@ pipeline {
environment {
YARN_CACHE_FOLDER = "${env.WORKSPACE}/yarn-cache"
SPAWN_WRAP_SHIM_ROOT = "${env.WORKSPACE}"
EMAIL_TO= "[email protected]"
}

stages {
Expand Down Expand Up @@ -248,6 +249,36 @@ pipeline {
// Record maven,java warnings
recordIssues enabledForFailure: true, skipPublishingChecks:true, tools: [mavenConsole(), java()]
}
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}"
}
}
}
}
}
}
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"name": "parent",
"version": "1.0.0",
"engines": {
"yarn": ">=1.7.0 <2.x.x"
"yarn": ">=1.7.0 <2.x.x",
"node": ">=14.18.0"
},
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
"author": {
Expand Down Expand Up @@ -35,7 +36,7 @@
"start:workflow": "yarn --cwd workflow/glsp-client/workflow-browser-app start"
},
"devDependencies": {
"@eclipse-glsp/config": "1.0.0",
"typescript": "^3.9.2"
"@eclipse-glsp/config": "1.1.0-next.d03ad9f.112",
"typescript": "^4.9.3"
}
}
19 changes: 6 additions & 13 deletions project-templates/java-emf-eclipse/glsp-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"name": "parent",
"version": "1.0.0",
"engines": {
"yarn": ">=1.7.0",
"node": ">=12.14.1"
"yarn": ">=1.7.0 <2.x.x",
"node": ">=14.18.0"
},
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
"author": {
Expand All @@ -31,20 +31,13 @@
"copyClient": "copyfiles -f ./tasklist-eclipse//app/* ../glsp-server/org.eclipse.glsp.example.javaemf.editor/diagram"
},
"devDependencies": {
"@eclipse-glsp/config": "^1.0.0",
"lerna": "^4.0.0",
"typescript": "~4.5.5",
"@eclipse-glsp/config": "1.1.0-next.d03ad9f.112",
"lerna": "^6.1.0",
"typescript": "^4.9.3",
"copyfiles": "^2.4.1"
},
"workspaces": [
"tasklist-glsp",
"tasklist-eclipse"
],
"resolutions": {
"**/@theia/core": "1.27.0",
"**/@theia/editor": "1.27.0",
"**/@theia/filesystem": "1.27.0",
"**/@theia/messages": "1.27.0",
"**/@theia/monaco": "1.27.0"
}
]
}
2 changes: 1 addition & 1 deletion project-templates/java-emf-eclipse/glsp-client/tasklist-glsp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"devDependencies": {
"rimraf": "^2.6.1",
"typescript": "~4.5.5"
"typescript": "^4.9.3"
},
"scripts": {
"prepare": "yarn clean && yarn build && yarn lint",
Expand Down
Loading