CI WIP

rafiki270 · rafiki270 · commit 3fb5deeeee69 · 2018-08-13T13:07:44.000+01:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
         parallel {
             stage('Build MacOS') {
               agent {
-                label 'xcode'
+                label 'mac'
               }
               when {
                 anyOf {
@@ -23,7 +23,7 @@ pipeline {
               }
             }
 
-            stage('Build Linux') {
+            stage('Build Linux (Docker)') {
               agent any
               when {
                 anyOf {
@@ -32,9 +32,7 @@ pipeline {
               }
               steps {
                 script {
-                  mgw.inDocker('liveui/boost-base:1.1.1') {
-                    sh 'swift test'
-                  }
+                  sh './scripts/docker-shortcuts/test.sh'
                 }
               }
             }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ pipeline {`
`9`	`9`	`parallel {`
`10`	`10`	`stage('Build MacOS') {`
`11`	`11`	`agent {`
`12`		`- label 'xcode'`
	`12`	`+ label 'mac'`
`13`	`13`	`}`
`14`	`14`	`when {`
`15`	`15`	`anyOf {`
`@@ -23,7 +23,7 @@ pipeline {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- stage('Build Linux') {`
	`26`	`+ stage('Build Linux (Docker)') {`
`27`	`27`	`agent any`
`28`	`28`	`when {`
`29`	`29`	`anyOf {`
`@@ -32,9 +32,7 @@ pipeline {`
`32`	`32`	`}`
`33`	`33`	`steps {`
`34`	`34`	`script {`
`35`		`- mgw.inDocker('liveui/boost-base:1.1.1') {`
`36`		`- sh 'swift test'`
`37`		`- }`
	`35`	`+ sh './scripts/docker-shortcuts/test.sh'`
`38`	`36`	`}`
`39`	`37`	`}`
`40`	`38`	`}`