Skip to content

Commit

Permalink
test deadline for kbfs lint (keybase#22644)
Browse files Browse the repository at this point in the history
  • Loading branch information
heronhaye authored Feb 19, 2020
1 parent f6b58b5 commit 04cbb4c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@ def testGo(prefix, packagesToTest) {
def goversion = sh(returnStdout: true, script: "go version").trim()
println "Testing Go code on commit ${env.COMMIT_HASH} with ${goversion}. Merging to branch ${env.CHANGE_TARGET}."


println "Running golint"
retry(5) {
sh 'go get -u golang.org/x/lint/golint'
Expand All @@ -495,7 +496,6 @@ def testGo(prefix, packagesToTest) {
}
}


def hasKBFSChanges = packagesToTest.keySet().findIndexOf { key -> key =~ /^github.com\/keybase\/client\/go\/kbfs/ } >= 0
if (hasKBFSChanges) {
println "Running golangci-lint on KBFS"
Expand All @@ -504,7 +504,7 @@ def testGo(prefix, packagesToTest) {
timeout(activity: true, time: 180, unit: 'SECONDS') {
// Ignore the `dokan` directory since it contains lots of c code.
// Ignore the `protocol` directory, autogeneration has some critques
sh 'go list -f "{{.Dir}}" ./... | fgrep -v dokan | xargs realpath --relative-to=. | xargs golangci-lint run'
sh 'go list -f "{{.Dir}}" ./... | fgrep -v dokan | xargs realpath --relative-to=. | xargs golangci-lint run --deadline 5m0s'
}
}
}
Expand Down

0 comments on commit 04cbb4c

Please sign in to comment.