From b9cfab4a0c3b839b520735e4a183ca83d5e2f124 Mon Sep 17 00:00:00 2001 From: Evan Lojewski Date: Sat, 19 Jun 2021 14:00:44 -0600 Subject: Build: Cleanup additional static analysis issues. (#231) --- .jenkins.groovy | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to '.jenkins.groovy') diff --git a/.jenkins.groovy b/.jenkins.groovy index c662870..e5f784a 100644 --- a/.jenkins.groovy +++ b/.jenkins.groovy @@ -62,7 +62,8 @@ def build(nodeName, archive = false, archiveCab = false, analyze = true, testArc cleanWs() def url = '' def refspec = '+refs/heads/*:refs/remotes/origin/*' - try { + try + { url = GITHUB_REPO_GIT_URL } catch (exc) @@ -70,12 +71,14 @@ def build(nodeName, archive = false, archiveCab = false, analyze = true, testArc url = 'git://github.com/meklort/bcm5719-fw.git' } def hash = '' - try { + try + { hash = GITHUB_BRANCH_HEAD_SHA } catch (exc) { - try { + try + { hash = GITHUB_PR_HEAD_SHA refspec = '+refs/pull/*:refs/remotes/origin/pr/*' } @@ -105,11 +108,11 @@ def build(nodeName, archive = false, archiveCab = false, analyze = true, testArc ]] ]) - def git_subject = sh ( + def gitSubject = sh ( script: 'git show -s --format=%s', returnStdout: true, ).trim() - currentBuild.description = git_subject + currentBuild.description = gitSubject } stage('build') -- cgit v1.2.1