diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 15:08:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 15:08:05 +0000 |
| commit | f78257cbddd711e18cbce93ad740a4aa0acac347 (patch) | |
| tree | 7f018abe3ce1c0010879cc480f348a35e616fabb /scripts | |
| parent | f500600a43b531e2e7a5858b74bd35312b02c349 (diff) | |
| download | gitlab-ce-f78257cbddd711e18cbce93ad740a4aa0acac347.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/trigger-build | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build index 6359446ecd1..c7b45480bf3 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -176,11 +176,9 @@ module Trigger edition = Trigger.ee? ? 'EE' : 'CE' { - # Back-compatibility until https://gitlab.com/gitlab-org/build/CNG/merge_requests/189 is merged - "GITLAB_#{edition}_VERSION" => ENV['CI_COMMIT_REF_NAME'], - "GITLAB_VERSION" => ENV['CI_COMMIT_REF_NAME'], + "GITLAB_VERSION" => ENV['CI_COMMIT_SHA'], "GITLAB_TAG" => ENV['CI_COMMIT_TAG'], - "GITLAB_ASSETS_TAG" => ENV['CI_COMMIT_TAG'] ? ENV['CI_COMMIT_REF_NAME'] : ENV['CI_COMMIT_REF_SLUG'], + "GITLAB_ASSETS_TAG" => ENV['CI_COMMIT_TAG'] ? ENV['CI_COMMIT_REF_NAME'] : ENV['CI_COMMIT_SHA'], "FORCE_RAILS_IMAGE_BUILDS" => 'true', "#{edition}_PIPELINE" => 'true' } |