Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Jenkinsfile to use NPM CLI v8 on Windows #4215

Merged
merged 1 commit into from
Jan 13, 2022
Merged

Update Jenkinsfile to use NPM CLI v8 on Windows #4215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import groovy.json.JsonOutput
repoName = 'realm-js'

platforms = ['win32-ia32', 'win32-x64', 'darwin-x64', 'darwin-arm64', 'linux-x64', 'linux-arm']
nodeTestVersion = '12.22.5'
nodeTestVersion = '16.13.1'
npmVersion = '8.1.2'

//Changing electron versions for testing requires upgrading the spectron dependency in tests/electron/package.json to a specific version.
//For more see https://www.npmjs.com/package/spectron
Expand Down Expand Up @@ -236,8 +237,11 @@ def buildWindows(nodeVersion, arch) {
return {
myNode('windows && nodejs') {
unstash 'source'

bat "nodist add ${nodeVersion}"
bat "nodist npm add ${npmVersion}"
Comment on lines +240 to +241
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
bat "nodist add ${nodeVersion}"
bat "nodist npm add ${npmVersion}"
bat """
nodist add ${nodeVersion}
nodist npm add ${npmVersion}
"""

You can use a single shell block to run both commands.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the suggestion. I like the simplicity of separating these. In my opinion it makes it simpler to determine what command failed.

withEnv([
"NODIST_NODE_VERSION=${nodeVersion}",
"NODIST_NPM_VERSION=${npmVersion}",
"_MSPDBSRV_ENDPOINT_=${UUID.randomUUID().toString()}",
"PATH+CMAKE=${tool 'cmake'}\\.."
]) {
Expand Down Expand Up @@ -505,9 +509,11 @@ def testWindows(nodeVersion) {
node('windows && nodist') {
unstash 'source'
bat "nodist add ${nodeVersion}"
bat "nodist npm add ${npmVersion}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can run both commands in a single block, see previous suggestion.

try {
withEnv([
"NODE_NODIST_VERSION=${nodeVersion}",
"NODIST_NODE_VERSION=${nodeVersion}",
"NODIST_NPM_VERSION=${npmVersion}",
"PATH+CMAKE=${tool 'cmake'}\\..",
]) {
// FIXME: remove debug option when the Release builds are working again
Expand Down