From 7c445d85dd0d64d5c65bf19bbb58a94847ed5a97 Mon Sep 17 00:00:00 2001 From: Alex Earl Date: Wed, 21 Aug 2019 09:54:29 -0700 Subject: [PATCH 1/2] Add build of Windows container --- Jenkinsfile | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 72b0e11c1..5d92bf510 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,9 +12,24 @@ pipeline { } stages { - stage('Prepare Workspace') { - steps { - sh './build.sh' + stage('Build') { + parallel { + stage('Windows') { + agent { + label "windock" + } + steps { + bat "powershell -File ./build.ps1" + } + } + stage('Linux') { + agent { + label "docker" + } + steps { + sh "./build.sh" + } + } } } } From 4f96779f9458ef71482ad3998b6bc20801047305 Mon Sep 17 00:00:00 2001 From: Alex Earl Date: Wed, 18 Sep 2019 12:26:29 -0700 Subject: [PATCH 2/2] Use powershell step --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5d92bf510..b868c04d5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { label "windock" } steps { - bat "powershell -File ./build.ps1" + powershell "& ./build.ps1" } } stage('Linux') {