Yet another attempt at sysdyn setup pipeline

gitlab #34

diff --git a/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup b/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup
index d5254f4a04fe5a931c1bd9edf7573012d1d833af..f500b45fa4c627f7f632e6b0d76e2d3f64dc06a4 100644 (file)
--- a/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup
+++ b/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup
@@ -1,32 +1,24 @@
 pipeline {
     agent { label 'windows' }
     stages  {
-        stage ('Build Sysdyn Without OpenModelica installer') {
+        stage ('Build Sysdyn Installers') {
             agent { label 'windows' }
             steps {
                 powershell '''
                     $ProgressPreference = "silentlyContinue"
 
                     wget "http://www.simantics.org/download/${Env:BRANCH}/sysdyn/products/Simantics-Sysdyn-win32.win32.x86_64.zip" -OutFile sysdyn.zip
-                    Expand-Archive ./sysdyn.zip -DestinationPath releng/inno-setup/sysdyn
+                    7z x -bd -oreleng/inno-setup/sysdyn sysdyn.zip
                     robocopy /MIR /NFL /NDL /NP C:/jenkins/jre8/win32.x86_64 releng/inno-setup/sysdyn/jre
                     iscc /Q releng/inno-setup/sysdyn.iss
 
                     wget "http://www.simantics.org/download/${Env:BRANCH}/sysdyn/products/Simantics-Sysdyn-OM-win32.win32.x86_64.zip" -OutFile sysdyn-om.zip
-                    Expand-Archive ./sysdyn-om.zip -DestinationPath releng/inno-setup/sysdyn-om
+                    7z x -bd -oreleng/inno-setup/sysdyn-om sysdyn-om.zip
                     robocopy /MIR /NFL /NDL /NP C:/jenkins/jre8/win32.x86_64 releng/inno-setup/sysdyn-om/jre
                     iscc /Q releng/inno-setup/sysdyn-om.iss
                 '''
                 archiveArtifacts artifacts: 'releng/inno-setup/output/*.exe', fingerprint: false
             }
         }
-        stage ('Build Sysdyn with OpenModelica installer') {
-            agent { label 'windows' }
-            steps {
-                powershell '''
-                '''
-                archiveArtifacts artifacts: 'releng/inno-setup/output/*.exe', fingerprint: false
-            }
-        }
     }
 }