JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: move go-licenses check to premerge

Browse Source 
License check is unlikely to fail, hence it's better to do it as part of
premerge rather than verify.

Also, fix indentation in Jenkinsfile.

Change-Id: Ifb37b92a88eb743a28847d84ed63c0e2e784dbe2
This commit is contained in:
Egon Elbre 2023-03-13 12:20:20 +02:00 committed by Michal Niewrzal
parent bf45e53169
commit 7fa1a633aa
2 changed files with 143 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Jenkinsfile.premerge
View File

@ -132,6 +132,13 @@ pipeline {
} }
} }
stage('Lint') {
steps {
// go-licenses by default has AGPL3 in the forbidden list, hence we need to explicitly allow `storj.io/storj`.
sh 'go-licenses check --ignore "storj.io/storj" ./...'
}
}
stage('Check Benchmark') { stage('Check Benchmark') {
environment { environment {
STORJ_TEST_COCKROACH = 'omit' STORJ_TEST_COCKROACH = 'omit'

3
Jenkinsfile.verify
View File

@ -141,9 +141,6 @@ pipeline {
dir("testsuite/storjscan") { dir("testsuite/storjscan") {
sh 'go vet ./...' sh 'go vet ./...'
} }
// go-licenses by default has AGPL3 in the forbidden list, hence we need to explicitly allow `storj.io/storj`.
sh 'go-licenses check --ignore "storj.io/storj" ./...'
} }
} }