diff options
| author | Mark Lapierre <mlapierre@gitlab.com> | 2018-12-17 13:22:09 -0500 |
|---|---|---|
| committer | Mark Lapierre <mlapierre@gitlab.com> | 2018-12-17 15:30:52 -0500 |
| commit | 0f751f6f17d1f457276f15632b31203f658ec4c9 (patch) | |
| tree | 29e0b9eb4f41d07ecc8f5d09116a9be900605d58 /scripts/trigger-build | |
| parent | 4a10c813e726d09216c534bb0ad0ae50a0400259 (diff) | |
| download | gitlab-ce-0f751f6f17d1f457276f15632b31203f658ec4c9.tar.gz | |
Run gitlab:assets:compile on qa jobs
Optionally compiling assets when needed for qa jobs proved
unworkable so instead we fall back on compiling them for
all qa jobs.
Diffstat (limited to 'scripts/trigger-build')
| -rwxr-xr-x | scripts/trigger-build | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build index 14af3281106..4032ba853e6 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -68,7 +68,7 @@ module Trigger def base_variables { - 'GITLAB_REF_SLUG' => ref_slug, + 'GITLAB_REF_SLUG' => ENV['CI_COMMIT_REF_SLUG'], 'TRIGGERED_USER' => ENV['TRIGGERED_USER'] || ENV['GITLAB_USER_NAME'], 'TRIGGER_SOURCE' => ENV['CI_JOB_URL'], 'TOP_UPSTREAM_SOURCE_PROJECT' => ENV['CI_PROJECT_PATH'], @@ -77,12 +77,6 @@ module Trigger } end - def ref_slug - return 'master' if ENV['CI_COMMIT_REF_SLUG'] =~ %r{(\Aqa[/-]|-qa\z)} - - ENV['CI_COMMIT_REF_SLUG'] - end - # Read version files from all components def version_file_variables Dir.glob("*_VERSION").each_with_object({}) do |version_file, params| |