Skip to content

Commit 7b30407

Browse files
committed
removing npm update steps so as not to expose our build to npm bugs like npm/cli#5066
1 parent 75cded6 commit 7b30407

File tree

1 file changed

+4
-28
lines changed

1 file changed

+4
-28
lines changed

Jenkinsfile

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,6 @@ pipeline {
109109
sh 'cp ${WORKSPACE}/.npmrc ${WORKSPACE}/electron/.npmrc'
110110
}
111111
}
112-
stage('Linux Update NPM') {
113-
steps {
114-
sh 'cp -f ${WORKSPACE}/.npmrc ${linux_node_dir}/lib/.npmrc'
115-
sh 'cd ${linux_node_dir}/lib; PATH="${linux_node_dir}/bin:$PATH" ${linux_npm_exe} install npm; cd ${WORKSPACE}'
116-
sh 'rm -f ${linux_node_dir}/lib/.npmrc'
117-
sh 'PATH="${linux_node_dir}/bin:$PATH" ${linux_node_exe} --version'
118-
sh 'PATH="${linux_node_dir}/bin:$PATH" ${linux_npm_exe} --version'
119-
}
120-
}
121112
stage('Linux Install Project Dependencies') {
122113
steps {
123114
sh 'cat ${WORKSPACE}/webui/.npmrc'
@@ -254,15 +245,6 @@ pipeline {
254245
sh 'cp ${WORKSPACE}/.npmrc ${WORKSPACE}/electron/.npmrc'
255246
}
256247
}
257-
stage('MacOS Update NPM') {
258-
steps {
259-
sh 'cp -f ${WORKSPACE}/.npmrc ${mac_node_dir}/lib/.npmrc'
260-
sh 'cd ${mac_node_dir}/lib; PATH="${mac_node_dir}/bin:$PATH" ${mac_npm_exe} install npm; cd ${WORKSPACE}'
261-
sh 'rm -f ${mac_node_dir}/lib/.npmrc'
262-
sh 'PATH="${mac_node_dir}/bin:$PATH" ${mac_node_exe} --version'
263-
sh 'PATH="${mac_node_dir}/bin:$PATH" ${mac_npm_exe} --version'
264-
}
265-
}
266248
stage('MacOS Install Project Dependencies') {
267249
steps {
268250
sh 'cat ${WORKSPACE}/webui/.npmrc'
@@ -376,13 +358,6 @@ pipeline {
376358
bat 'copy /Y "%WORKSPACE%\\.npmrc" "%WORKSPACE%\\electron\\.npmrc"'
377359
}
378360
}
379-
stage('Windows Update NPM') {
380-
steps {
381-
bat 'copy /Y "%WORKSPACE%\\.npmrc" "%windows_node_dir%\\.npmrc"'
382-
bat 'cd "%windows_node_dir%" & set "PATH=%windows_node_dir%;%PATH%" & "%windows_npm_exe%" install npm@latest & cd "%WORKSPACE%"'
383-
bat 'del /F /Q "%windows_node_dir%\\.npmrc"'
384-
}
385-
}
386361
stage('Windows Install Project Dependencies') {
387362
steps {
388363
bat 'cd "%WORKSPACE%\\electron" & set "PATH=%windows_node_dir%;%PATH%" & set HTTPS_PROXY=%ORACLE_HTTP_PROXY% & "%windows_npm_exe%" install & cd "%WORKSPACE%"'
@@ -402,9 +377,10 @@ pipeline {
402377
}
403378
stage('Windows Build Installers') {
404379
steps {
405-
bat 'cd "%WORKSPACE%\\webui" & set "PATH=%windows_node_dir%;%PATH%" & set "HTTPS_PROXY=%WKTUI_PROXY%" & "node_modules\\.bin\\ojet" build web --release & cd "%WORKSPACE%"'
406-
bat 'cd "%WORKSPACE%\\electron" & set "PATH=%windows_node_dir%;%PATH%" & set "HTTPS_PROXY=%WKTUI_PROXY%" & "%windows_node_exe%" scripts/installTools.js & cd "%WORKSPACE%"'
407-
bat 'cd "%WORKSPACE%\\electron" & set "PATH=%windows_node_dir%;%PATH%" & set "HTTPS_PROXY=%WKTUI_PROXY%" & "node_modules\\.bin\\electron-builder" -p never & cd "%WORKSPACE%"'
380+
bat 'cd "%WORKSPACE%\\electron" & set "PATH=%windows_node_dir%;%PATH%" & set "HTTPS_PROXY=%WKTUI_PROXY%" & "%windows_npm_exe%" run build & cd "%WORKSPACE%"'
381+
// bat 'cd "%WORKSPACE%\\webui" & set "PATH=%windows_node_dir%;%PATH%" & set "HTTPS_PROXY=%WKTUI_PROXY%" & "node_modules\\.bin\\ojet" build web --release & cd "%WORKSPACE%"'
382+
// bat 'cd "%WORKSPACE%\\electron" & set "PATH=%windows_node_dir%;%PATH%" & set "HTTPS_PROXY=%WKTUI_PROXY%" & "%windows_node_exe%" scripts/installTools.js & cd "%WORKSPACE%"'
383+
// bat 'cd "%WORKSPACE%\\electron" & set "PATH=%windows_node_dir%;%PATH%" & set "HTTPS_PROXY=%WKTUI_PROXY%" & "node_modules\\.bin\\electron-builder" -p never & cd "%WORKSPACE%"'
408384
archiveArtifacts 'dist/*.exe'
409385
archiveArtifacts "dist/*.blockmap"
410386
archiveArtifacts "dist/latest.yml"

0 commit comments

Comments
 (0)