From f68ba7ec11e700592ec24f1d96b5e151e7864fae Mon Sep 17 00:00:00 2001
From: Jinbo Wang <jinbwan@microsoft.com>
Date: Mon, 10 Jan 2022 09:14:39 +0800
Subject: [PATCH] Fix Jenkinsfile to publish the correct generic version
 (#2252)

Signed-off-by: Jinbo Wang <jinbwan@microsoft.com>
---
 Jenkinsfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d36d976bb..adbeca70a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -78,6 +78,8 @@ node('rhel8'){
 	for(artifact in artifacts){
 		sh "rsync -Pzrlt --rsh=ssh --protocol=28 --relative ${artifactDir}/${artifact.path} ${UPLOAD_LOCATION}/jdt.ls/staging"
 	}
+	// Clean up build vsix
+	sh "rm -rf ${artifactDir}"
 }
 
 node('rhel8'){
@@ -98,6 +100,8 @@ node('rhel8'){
 		stage "Publish to VS Code Marketplace"
 		// VS Code Marketplace
 		withCredentials([[$class: 'StringBinding', credentialsId: 'vscode_java_marketplace', variable: 'TOKEN']]) {
+			// Clean up embedded jre folder from previous build
+			sh 'npx gulp clean_jre'
 			// Publish a generic version
 			sh 'vsce publish -p ${TOKEN} --target win32-ia32 win32-arm64 linux-armhf alpine-x64 alpine-arm64'
 
@@ -111,9 +115,9 @@ node('rhel8'){
 
 		stage "Publish to http://download.jboss.org/jbosstools/static/jdt.ls/stable/"
 		def artifacts = findFiles(glob: '**.vsix')
-    	def artifactDir = "java-${env.EXTENSION_VERSION}"
-	    sh "mkdir ${artifactDir}"
-	    sh "mv *.vsix ${artifactDir}"
+		def artifactDir = "java-${env.EXTENSION_VERSION}"
+		sh "mkdir ${artifactDir}"
+		sh "mv *.vsix ${artifactDir}"
 
 		archive includes:"${artifactDir}/**/*.*"