From ab05a8bbb48a3a3c6ff34935f5b7a6b5afea9274 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 17 Apr 2020 13:30:56 -0700 Subject: [PATCH 1/2] Update jenkins.js --- services/jenkins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/jenkins.js b/services/jenkins.js index 3d2b3bb6..2c5188e8 100644 --- a/services/jenkins.js +++ b/services/jenkins.js @@ -9,7 +9,7 @@ module.exports = { configuration({env, cwd}) { const pr = env.ghprbPullId || env.gitlabMergeRequestId || env.CHANGE_ID; const isPr = Boolean(pr); - const localBranch = env.GIT_LOCAL_BRANCH || env.GIT_BRANCH || env.gitlabBranch || env.BRANCH_NAME; + const localBranch = env.GIT_LOCAL_BRANCH || env.CHANGE_BRANCH || env.GIT_BRANCH || env.gitlabBranch || env.BRANCH_NAME; return { name: 'Jenkins', From fa5631d916c5e082bd828682aae69ac81bdb20eb Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 17 Apr 2020 13:38:36 -0700 Subject: [PATCH 2/2] fix lint --- services/jenkins.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/jenkins.js b/services/jenkins.js index 2c5188e8..b948360c 100644 --- a/services/jenkins.js +++ b/services/jenkins.js @@ -9,7 +9,8 @@ module.exports = { configuration({env, cwd}) { const pr = env.ghprbPullId || env.gitlabMergeRequestId || env.CHANGE_ID; const isPr = Boolean(pr); - const localBranch = env.GIT_LOCAL_BRANCH || env.CHANGE_BRANCH || env.GIT_BRANCH || env.gitlabBranch || env.BRANCH_NAME; + const localBranch = + env.GIT_LOCAL_BRANCH || env.CHANGE_BRANCH || env.GIT_BRANCH || env.gitlabBranch || env.BRANCH_NAME; return { name: 'Jenkins',