From 0ed66b98aefb14bb1b90def5cddb79b81d34c6a0 Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Fri, 20 Dec 2019 13:02:44 +0100 Subject: [PATCH] Fail build if `make vendor` hasn't been run --- _assets/ci/Jenkinsfile | 7 ++++++- _assets/ci/Jenkinsfile.android | 7 ++++++- _assets/ci/Jenkinsfile.tests | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/_assets/ci/Jenkinsfile b/_assets/ci/Jenkinsfile index c2c095f08..e1da75fc9 100644 --- a/_assets/ci/Jenkinsfile +++ b/_assets/ci/Jenkinsfile @@ -47,9 +47,14 @@ 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 check') { steps { dir(env.STATUS_PATH) { + /* fail build if vendoring hasn't been done */ + sh 'GO111MODULE=on make vendor && git diff --exit-code --no-color --stat vendor/' + } } } // stage(Vendoring check) + stage('Build') { parallel { stage('iOS') { steps { script { diff --git a/_assets/ci/Jenkinsfile.android b/_assets/ci/Jenkinsfile.android index c614ca0fa..7ee16c4d4 100644 --- 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 check') { steps { dir(env.STATUS_PATH) { + /* fail build if vendoring hasn't been done */ + sh 'GO111MODULE=on make vendor && git diff --exit-code --no-color --stat vendor/' + } } } // stage(Vendoring check) + stage('Compile') { steps { dir(env.STATUS_PATH) { sh 'make statusgo-android' sh "cp build/bin/statusgo.aar ${dest}/${artifact}" diff --git a/_assets/ci/Jenkinsfile.tests b/_assets/ci/Jenkinsfile.tests index c1ad19efa..98d53551d 100644 --- a/_assets/ci/Jenkinsfile.tests +++ b/_assets/ci/Jenkinsfile.tests @@ -39,9 +39,14 @@ pipeline { } } } stage('Setup') { steps { dir(env.STATUS_PATH) { - sh 'make setup-build' + sh 'GO111MODULE=off make setup-build modvendor-install' } } } + stage('Vendoring check') { steps { dir(env.STATUS_PATH) { + /* fail build if vendoring hasn't been done */ + sh 'GO111MODULE=on make vendor && git diff --exit-code --no-color --stat vendor/' + } } } // stage(Vendoring check) + stage('Lint') { steps { dir(env.STATUS_PATH) { sh 'make lint' } } }