diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-16 06:11:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-16 06:11:39 +0300 |
| commit | 37d1a6b416a10e64ba9194aacf7da97a5e30140f (patch) | |
| tree | 54494e4ddcc6e128e2a0e11dc874cced46308918 /scripts/trigger-build.rb | |
| parent | 21fc10ad5a7c829e64112fac37727f31f072ef33 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/trigger-build.rb')
| -rwxr-xr-x | scripts/trigger-build.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/trigger-build.rb b/scripts/trigger-build.rb index 8dfab8dd2eb..897ca9f473e 100755 --- a/scripts/trigger-build.rb +++ b/scripts/trigger-build.rb @@ -160,8 +160,6 @@ module Trigger end class CNG < Base - ASSETS_HASH = "cached-assets-hash.txt" - def variables # Delete variables that aren't useful when using native triggers. super.tap do |hash| @@ -189,6 +187,7 @@ module Trigger "TRIGGER_BRANCH" => ref, "GITLAB_VERSION" => ENV['CI_COMMIT_SHA'], "GITLAB_TAG" => ENV['CI_COMMIT_TAG'], # Always set a value, even an empty string, so that the downstream pipeline can correctly check it. + "GITLAB_ASSETS_TAG" => ENV['CI_COMMIT_TAG'] ? ENV['CI_COMMIT_REF_NAME'] : ENV['CI_COMMIT_SHA'], "FORCE_RAILS_IMAGE_BUILDS" => 'true', "CE_PIPELINE" => Trigger.ee? ? nil : "true", # Always set a value, even an empty string, so that the downstream pipeline can correctly check it. "EE_PIPELINE" => Trigger.ee? ? "true" : nil # Always set a value, even an empty string, so that the downstream pipeline can correctly check it. |