diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-06 21:10:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-06 21:10:28 +0300 |
| commit | 958f41148d08b03a9bbe37adecd6e3b0b10a7219 (patch) | |
| tree | 5998b3443f6b425b982857a078b95997f5231309 /scripts/trigger-build.rb | |
| parent | b333706699e505b2a0a4fa9cc64b9d2358f271a5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/trigger-build.rb')
| -rwxr-xr-x | scripts/trigger-build.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/trigger-build.rb b/scripts/trigger-build.rb index 75f3967cb4a..b2bf2d5c680 100755 --- a/scripts/trigger-build.rb +++ b/scripts/trigger-build.rb @@ -389,8 +389,9 @@ module Trigger def extra_variables { - 'GITLAB_COMMIT_SHA' => ENV['CI_COMMIT_SHA'], - 'TRIGGERED_USER_LOGIN' => ENV['GITLAB_USER_LOGIN'] + 'GITLAB_COMMIT_SHA' => Trigger.non_empty_variable_value('CI_MERGE_REQUEST_SOURCE_BRANCH_SHA') || ENV['CI_COMMIT_SHA'], + 'TRIGGERED_USER_LOGIN' => ENV['GITLAB_USER_LOGIN'], + 'TOP_UPSTREAM_SOURCE_SHA' => Trigger.non_empty_variable_value('CI_MERGE_REQUEST_SOURCE_BRANCH_SHA') || ENV['CI_COMMIT_SHA'] } end |