From e27689c9eba6114a7e26f04e6865fd18706640e1 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Thu, 3 Feb 2022 16:59:43 -0500 Subject: [PATCH] Eliminate need for downloading just-released binary checksums. - When the build process finishes building binaries, and generating the checksums, we should stash these to avoid having to download once deployed - Also use ovsx<0.3.0 to ensure we build with Node v12 Signed-off-by: Roland Grunberg --- Jenkinsfile | 7 +++---- NativeImage.jenkins | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d970fac7..8c068200 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,9 +59,8 @@ node('rhel8'){ stage 'package binary hashes' sh "mkdir ./server" - sh "curl ${downloadLocation}/vscode/${binaryUploadFolder}/lemminx-binary/${packageJson.version}-${env.BUILD_NUMBER}/lemminx-linux.sha256 -o ./server/lemminx-linux.sha256" - sh "curl ${downloadLocation}/vscode/${binaryUploadFolder}/lemminx-binary/${packageJson.version}-${env.BUILD_NUMBER}/lemminx-win32.sha256 -o ./server/lemminx-win32.sha256" - sh "curl ${downloadLocation}/vscode/${binaryUploadFolder}/lemminx-binary/${packageJson.version}-${env.BUILD_NUMBER}/lemminx-osx-x86_64.sha256 -o ./server/lemminx-osx-x86_64.sha256" + unstash name: 'checksums' + sh "mv lemminx-*.sha256 ./server" stage 'install vscode-xml build requirements' installBuildRequirements() @@ -101,7 +100,7 @@ node('rhel8'){ } // Open-vsx Marketplace - sh "npm install -g ovsx" + sh 'npm install -g "ovsx<0.3.0"' withCredentials([[$class: 'StringBinding', credentialsId: 'open-vsx-access-token', variable: 'OVSX_TOKEN']]) { sh 'ovsx publish -p ${OVSX_TOKEN}' + " ${vsix[0].path}" } diff --git a/NativeImage.jenkins b/NativeImage.jenkins index bc34e5d0..29841b26 100644 --- a/NativeImage.jenkins +++ b/NativeImage.jenkins @@ -130,6 +130,7 @@ pipeline { sh "sha256sum lemminx-linux > lemminx-linux.sha256" sh "sha256sum lemminx-win32.exe > lemminx-win32.sha256" sh "sha256sum lemminx-osx-x86_64 > lemminx-osx-x86_64.sha256" + stash name: 'checksums', includes: 'lemminx-*.sha256' // Move artifacts into a folder name unique to this build sh "curl -Lo package.json https://raw.githubusercontent.com/${params.FORK}/vscode-xml/${params.BRANCH}/package.json"