clean up and backport stuff to ios

status-im · Aug 19, 2019 · b5e4e01 · b5e4e01
1 parent f1b233b
commit b5e4e01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/_assets/ci/Jenkinsfile.android b/_assets/ci/Jenkinsfile.android
@@ -57,7 +57,7 @@ pipeline {
 
     stage('Setup') { steps { dir(env.STATUS_PATH) {
       sh 'make setup-build'
-      sh 'GO111MODULE=off go get golang.org/x/tools/go/packages'
+      sh 'go get golang.org/x/tools/go/packages'
     } } }
 
     stage('Compile') { steps { dir(env.STATUS_PATH) {

diff --git a/_assets/ci/Jenkinsfile.ios b/_assets/ci/Jenkinsfile.ios
@@ -32,6 +32,8 @@ pipeline {
     CI_DIR         = "${env.STATUS_PATH}/_assets/ci"
     GOPATH         = "${env.WORKSPACE}"
     PATH           = "/usr/local/go/bin:${env.PATH}:${env.GOPATH}/bin"
+    CGO_ENABLED    = "1"
+    GO111MODULE    = "off"
   }
 
   stages {
@@ -54,6 +56,7 @@ pipeline {
 
     stage('Compile') { steps { dir(env.STATUS_PATH) {
       sh 'make statusgo-ios'
+      sh 'go get golang.org/x/tools/go/packages'
       dir('build/bin') {
         sh 'zip -r status-go-ios.zip Statusgo.framework'
         sh "cp status-go-ios.zip ${dest}/${artifact}"