diff --git a/Jenkins/master-windows-pipeline/Jenkinsfile b/Jenkins/master-windows-pipeline/Jenkinsfile index 7708c36..8c11e9f 100644 --- a/Jenkins/master-windows-pipeline/Jenkinsfile +++ b/Jenkins/master-windows-pipeline/Jenkinsfile @@ -27,9 +27,8 @@ pipeline { stage("git checkout"){ steps { git url: 'https://github.com/llvm/llvm-project.git' - // check if this also works on windows - //sh 'git clean -fdx' - sh 'mkdir -p llvm-premerge-checks' + pwsh 'git clean -fdx' + pwsh 'mkdir llvm-premerge-checks' dir("llvm-premerge-checks") { git url: 'https://github.com/google/llvm-premerge-checks.git' @@ -38,17 +37,17 @@ pipeline { } stage('CMake') { steps { - sh "${SCRIPT_DIR}/run_cmake.ps1" + pwsh "${SCRIPT_DIR}/run_cmake.ps1" } } stage('ninja all') { steps { - sh "${SCRIPT_DIR}/run_ninja.ps1 all" + pwsh "${SCRIPT_DIR}/run_ninja.ps1 all" } } stage('ninja check-all') { steps { - sh "${SCRIPT_DIR}/run_ninja.ps1 check-all" + pwsh "${SCRIPT_DIR}/run_ninja.ps1 check-all" } } } @@ -58,7 +57,7 @@ pipeline { echo "Console log is available at https://results.new.llvm-merge-guard.org/${BUILD_ID}" dir("${env.TARGET_DIR}") { // copy console log to result folder - sh "wget -qO console-log.txt http://jenkins-ui.jenkins.svc.cluster.local:8080/job/${JOB_BASE_NAME}/${BUILD_NUMBER}/consoleText" + bat "wget -qO console-log.txt http://jenkins-ui.jenkins.svc.cluster.local:8080/job/${JOB_BASE_NAME}/${BUILD_NUMBER}/consoleText" // TODO: move all file copy operations here } }