From 855900502735f91e4c2c2b2d52c2d740506e7505 Mon Sep 17 00:00:00 2001 From: LSP4Jakarta GitHub Bot Date: Mon, 7 Aug 2023 10:04:25 -0400 Subject: [PATCH 1/2] Deploy all artifacts to repo.eclipse.org --- Release.Jenkinsfile | 15 +++++++++++---- jakarta.ls/pom.xml | 10 ++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Release.Jenkinsfile b/Release.Jenkinsfile index 96a17464..d6d9941b 100644 --- a/Release.Jenkinsfile +++ b/Release.Jenkinsfile @@ -9,6 +9,7 @@ pipeline { } parameters { string(name: 'VERSION', defaultValue: '', description: 'Version to Release?') + string(name: 'VERSION_SNAPSHOT', defaultValue: '', description: 'Next Development Version?') } stages { stage("Release LSP4Jakarta Language Server"){ @@ -21,10 +22,16 @@ pipeline { withMaven { sh "VERSION=${params.VERSION}" sh ''' - cd jakarta.jdt - ./mvnw -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=$VERSION-SNAPSHOT + cd jakarta.eclipse + ./mvnw -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=$VERSION + cd ../jakarta.ls + ./mvnw -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=$VERSION ./mvnw versions:set-scm-tag -DnewTag=$VERSION - ./mvnw clean verify -B -Peclipse-sign -Dcbi.jarsigner.skip=false + ./mvnw clean deploy -B -Peclipse-sign -Dcbi.jarsigner.skip=false + cd ../jakarta.jdt + ./mvnw -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=$VERSION + ./mvnw versions:set-scm-tag -DnewTag=$VERSION + ./mvnw clean deploy -B -Peclipse-sign -Dcbi.jarsigner.skip=false cd .. ''' } @@ -64,7 +71,7 @@ pipeline { sh ''' git config --global user.email "lsp4jakarta-bot@eclipse.org" git config --global user.name "LSP4Jakarta GitHub Bot" - git add "**/pom.xml" "**/MANIFEST.MF" + git add "**/pom.xml" "**/MANIFEST.MF" "**/feature.xml" git commit -sm "Release $VERSION" git tag $VERSION git push origin $VERSION diff --git a/jakarta.ls/pom.xml b/jakarta.ls/pom.xml index 7fd7dbad..bd71b10d 100644 --- a/jakarta.ls/pom.xml +++ b/jakarta.ls/pom.xml @@ -32,6 +32,7 @@ UTF-8 + 3.0.3 17 17 0.17.0 @@ -132,6 +133,15 @@ + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + From e099fb2041197c174aeccc0f08780d0c8045deb3 Mon Sep 17 00:00:00 2001 From: LSP4Jakarta GitHub Bot Date: Mon, 7 Aug 2023 10:06:51 -0400 Subject: [PATCH 2/2] Auto update to next release version --- Release.Jenkinsfile | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/Release.Jenkinsfile b/Release.Jenkinsfile index d6d9941b..0319b84e 100644 --- a/Release.Jenkinsfile +++ b/Release.Jenkinsfile @@ -79,5 +79,39 @@ pipeline { } } } + + stage("Update to next development version"){ + steps { + withMaven { + sh "$VERSION_SNAPSHOT=${params.VERSION_SNAPSHOT}" + sh ''' + cd jakarta.eclipse + ./mvnw -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=$VERSION_SNAPSHOT + cd ../jakarta.ls + ./mvnw -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=$VERSION_SNAPSHOT + ./mvnw versions:set-scm-tag -DnewTag=$VERSION_SNAPSHOT + cd ../jakarta.jdt + ./mvnw -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=$VERSION_SNAPSHOT + ./mvnw versions:set-scm-tag -DnewTag=$VERSION_SNAPSHOT + cd .. + ''' + } + } + } + + stage('Push next development version') { + steps { + sshagent(['github-bot-ssh']) { + sh "$VERSION_SNAPSHOT=${params.$VERSION_SNAPSHOT}" + sh ''' + git config --global user.email "lsp4jakarta-bot@eclipse.org" + git config --global user.name "LSP4Jakarta GitHub Bot" + git add "**/pom.xml" "**/MANIFEST.MF" "**/feature.xml" + git commit -sm "New Development $VERSION_SNAPSHOT" + git push origin + ''' + } + } + } } }