fixup! Fail build if make vendor hasn't been run

status-im · Dec 20, 2019 · 7d27cb6 · 7d27cb6
1 parent b282857
commit 7d27cb6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/_assets/ci/Jenkinsfile b/_assets/ci/Jenkinsfile
@@ -47,12 +47,12 @@ pipeline {
 
     stage('Setup') { steps { dir(env.STATUS_PATH) {
       /* install release tools */
-      sh 'make release-install'
+      sh 'make release-install modvendor-install'
     } } } // stage(Setup)
 
     stage('Vendoring test') { steps { dir(env.STATUS_PATH) {
       /* fail build if vendoring hasn't been done */
-      sh 'make vendor && git diff --quiet vendor/'
+      sh 'GO111MODULE=on make vendor && git diff --quiet vendor/'
     } } } // stage(Setup)
 
     stage('Build') {

diff --git a/_assets/ci/Jenkinsfile.android b/_assets/ci/Jenkinsfile.android
@@ -58,9 +58,14 @@ pipeline {
     } } }
 
     stage('Setup') { steps { dir(env.STATUS_PATH) {
-      sh 'make setup-build'
+      sh 'make setup-build modvendor-install'
     } } }
 
+    stage('Vendoring test') { steps { dir(env.STATUS_PATH) {
+      /* fail build if vendoring hasn't been done */
+      sh 'GO111MODULE=on make vendor && git diff --quiet vendor/'
+    } } } // stage(Setup)
+
     stage('Compile') { steps { dir(env.STATUS_PATH) {
       sh 'make statusgo-android'
       sh "cp build/bin/statusgo.aar ${dest}/${artifact}"