From 04cbb4cf8969653f901b569e6e7c5f774a9ff8e5 Mon Sep 17 00:00:00 2001 From: heronhaye Date: Wed, 19 Feb 2020 11:01:27 -0500 Subject: [PATCH] test deadline for kbfs lint (#22644) --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6a9e2407743e..51d5d447a54e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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' @@ -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" @@ -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' } } }