From f82c08e3eaa98c9a696c8814e80b8c33e45571a7 Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Wed, 15 Sep 2021 15:14:26 -0500 Subject: [PATCH] fix: Update DRONE branch used for Dashboard (#18062) --- packages/server/lib/util/ci_provider.js | 3 ++- packages/server/test/unit/ci_provider_spec.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/server/lib/util/ci_provider.js b/packages/server/lib/util/ci_provider.js index 12ee0f9d556c..0eae4720ef7d 100644 --- a/packages/server/lib/util/ci_provider.js +++ b/packages/server/lib/util/ci_provider.js @@ -500,7 +500,8 @@ const _providerCommitParams = () => { }, drone: { sha: env.DRONE_COMMIT_SHA, - branch: env.DRONE_COMMIT_BRANCH, + // https://docs.drone.io/pipeline/environment/reference/drone-source-branch/ + branch: env.DRONE_SOURCE_BRANCH, message: env.DRONE_COMMIT_MESSAGE, authorName: env.DRONE_COMMIT_AUTHOR, authorEmail: env.DRONE_COMMIT_AUTHOR_EMAIL, diff --git a/packages/server/test/unit/ci_provider_spec.js b/packages/server/test/unit/ci_provider_spec.js index d8056a48e2be..774a891821be 100644 --- a/packages/server/test/unit/ci_provider_spec.js +++ b/packages/server/test/unit/ci_provider_spec.js @@ -514,7 +514,7 @@ describe('lib/util/ci_provider', () => { DRONE_PULL_REQUEST: 'dronePullRequest', DRONE_COMMIT_SHA: 'droneCommitSha', - DRONE_COMMIT_BRANCH: 'droneCommitBranch', + DRONE_SOURCE_BRANCH: 'droneCommitBranch', DRONE_COMMIT_MESSAGE: 'droneCommitMessage', DRONE_COMMIT_AUTHOR: 'droneCommitAuthor', DRONE_COMMIT_AUTHOR_EMAIL: 'droneCommitAuthorEmail',