Skip to content

Commit

Permalink
Update GLSP config packages
Browse files Browse the repository at this point in the history
- Define node 14.18.0 as minimal engine version
- Update eslint and mocha package dependencies to latest version
- Update Jenkins (Node 14 and proper failure reporting )

Part of #676
Part of #680
  • Loading branch information
tortmayr committed Dec 3, 2022
1 parent 1f55763 commit 913ceeb
Show file tree
Hide file tree
Showing 8 changed files with 1,871 additions and 1,687 deletions.
37 changes: 26 additions & 11 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: Pod
spec:
containers:
- name: node
image: node:12.22.10
image: node:14
tty: true
resources:
limits:
Expand Down Expand Up @@ -77,19 +77,34 @@ pipeline {

post {
failure {
emailext body: 'Check console output at $BUILD_URL to view the results. \n\n ${CHANGES} \n\n -------------------------------------------------- \n${BUILD_LOG, maxLines=100, escapeHtml=false}',
to: "${EMAIL_TO}",
subject: 'Build failed in Jenkins: $PROJECT_NAME - #$BUILD_NUMBER'
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 {
emailext body: 'Check console output at $BUILD_URL to view the results. \n\n ${CHANGES} \n\n -------------------------------------------------- \n${BUILD_LOG, maxLines=100, escapeHtml=false}',
to: "${EMAIL_TO}",
subject: 'Unstable build in Jenkins: $PROJECT_NAME - #$BUILD_NUMBER'
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}"
}
}
}
changed {
emailext body: 'Check console output at $BUILD_URL to view the results.',
to: "${EMAIL_TO}",
subject: 'Jenkins build is back to normal: $PROJECT_NAME - #$BUILD_NUMBER'
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}"
}
}
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
"version": "1.0.0",
"engines": {
"yarn": ">=1.7.0 <2.x.x",
"node": ">=12.14.1"
"node": ">=14.18.0"
},
"scripts": {
"publish:prepare": "lerna version --ignore-scripts --yes --no-push",
"publish:latest": "lerna publish from-git --no-git-reset --no-git-tag-version --no-verify-access --no-push",
"publish:next": "SHA=$(git rev-parse --short HEAD) && lerna publish preminor --exact --canary --preid next.${SHA} --dist-tag next --no-git-reset --no-git-tag-version --no-push --ignore-scripts --yes --no-verify-access"
},
"devDependencies": {
"lerna": "^4.0.0",
"typescript": "^4.5.0",
"@types/node": "12.x"
"lerna": "^6.1.0",
"typescript": "^4.9.3",
"@types/node": "14.x"
},
"workspaces": [
"packages/*"
Expand Down
14 changes: 7 additions & 7 deletions packages/config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eclipse-glsp/config",
"version": "1.0.0",
"version": "1.0.0-next",
"description": "Wrapper package that provides Typescript, ESLint, Mocha and prettier configurations for GLSP projects",
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
"keywords": [
Expand All @@ -27,14 +27,14 @@
"access": "public"
},
"dependencies": {
"@eclipse-glsp/eslint-config": "^1.0.0",
"@eclipse-glsp/mocha-config": "^1.0.0",
"@eclipse-glsp/prettier-config": "^1.0.0",
"@eclipse-glsp/ts-config": "^1.0.0",
"prettier": "^2.4.1"
"@eclipse-glsp/eslint-config": "1.0.0-next",
"@eclipse-glsp/mocha-config": "1.0.0-next",
"@eclipse-glsp/prettier-config": "1.0.0-next",
"@eclipse-glsp/ts-config": "1.0.0-next",
"prettier": "^2.8.0"
},
"devDependencies": {
"@types/node": ">=12.x",
"@types/node": ">=14.x",
"reflect-metadata": ">=0.1.13",
"typescript": ">=4.5.5"
}
Expand Down
12 changes: 6 additions & 6 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eclipse-glsp/eslint-config",
"version": "1.0.0",
"version": "1.0.0-next",
"description": "Shared ESLint configuration for GLSP projects",
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
"keywords": [
Expand All @@ -27,14 +27,14 @@
"access": "public"
},
"dependencies": {
"@typescript-eslint/eslint-plugin": "^5.13.0",
"@typescript-eslint/parser": "^5.13.0",
"eslint": "^8.10.0",
"@typescript-eslint/eslint-plugin": "^5.45.0",
"@typescript-eslint/parser": "^5.45.0",
"eslint": "^8.29.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-chai-friendly": "^0.7.2",
"eslint-plugin-deprecation": "^1.3.2",
"eslint-plugin-deprecation": "^1.3.3",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-no-null": "^1.0.2"
},
"main": "index.js"
Expand Down
20 changes: 10 additions & 10 deletions packages/mocha-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eclipse-glsp/mocha-config",
"version": "1.0.0",
"version": "1.0.0-next",
"description": "Shared Mocha test configuration for GLSP projects",
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
"keywords": [
Expand All @@ -25,21 +25,21 @@
}
],
"dependencies": {
"@types/chai": "^4.2.22",
"@types/mocha": "^9.0.0",
"@types/sinon": "^10.0.6",
"chai": "^4.3.4",
"@types/chai": "^4.3.4",
"@types/mocha": "^10.0.1",
"@types/sinon": "^10.0.13",
"chai": "^4.3.7",
"ignore-styles": "^5.0.1",
"mocha": "^9.1.3",
"mocha-jenkins-reporter": "^0.4.7",
"sinon": "^12.0.1",
"ts-node": "^10.4.0"
"mocha": "^10.1.0",
"mocha-jenkins-reporter": "^0.4.8",
"sinon": "^15.0.0",
"ts-node": "^10.9.1"
},
"devDependencies": {
"reflect-metadata": "^0.1.13"
},
"peerDependencies": {
"@types/node": ">=12.x",
"@types/node": ">=14.x",
"reflect-metadata": ">=0.1.13",
"typescript": ">=4.5.5"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/prettier-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eclipse-glsp/prettier-config",
"version": "1.0.0",
"version": "1.0.0-next",
"description": "Shared Prettier configuration for GLSP projects",
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/ts-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eclipse-glsp/ts-config",
"version": "1.0.0",
"version": "1.0.0-next",
"description": "Shared Typescript configuration for GLSP projects",
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
"keywords": [
Expand Down
Loading

0 comments on commit 913ceeb

Please sign in to comment.