Merge pull request #491 from mezarin/deployArtifactsAndGenNewDevVersion

Deploy artifacts and gen new dev version
eclipse · Aug 9, 2023 · 0aa1d57 · 0aa1d57
2 parents 110b11c + e099fb2
commit 0aa1d57
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 4 deletions.
diff --git 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,13 +71,47 @@ 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
           '''
         }
       }
     }
+
+    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
+          '''
+        }
+      }
+    }
   }
 }
diff --git a/jakarta.ls/pom.xml b/jakarta.ls/pom.xml
@@ -32,6 +32,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <tycho.version>3.0.3</tycho.version>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
     <lsp4j.version>0.17.0</lsp4j.version>
@@ -132,6 +133,15 @@
         </executions>
       </plugin>
     </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-packaging-plugin</artifactId>
+          <version>${tycho.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 
   <distributionManagement>