diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-01-29 17:09:17 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-01-29 17:09:17 +0000 |
| commit | eaf83ea9c7eef663456507c32b0c1511ab69d157 (patch) | |
| tree | 7f608467b3608127049ddc78d5045da032777cb4 /build.sh | |
| parent | 3e44cb06df22dd1b684dc8574c3b44d0851527bc (diff) | |
| parent | 2a6b48c9b0c813c5e4ff8ac176fdf4e6c9466c22 (diff) | |
Merged in D440-merge-master (pull request #1)
Merge master (release 6.3.7) into DRTVWR-440
Approved-by: Dave Houlton <euclid@lindenlab.com>
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 17 |
1 files changed, 17 insertions, 0 deletions
@@ -259,6 +259,23 @@ then export additional_packages= fi +begin_section "select viewer channel" +# Look for a branch-specific viewer_channel setting +# changeset_branch is set in the sling-buildscripts +viewer_build_branch=$(echo -n "${changeset_branch:-$(repo_branch ${BUILDSCRIPTS_SRC:-$(pwd)})}" | tr -Cs 'A-Za-z0-9_' '_' | sed -E 's/^_+//; s/_+$//') +if [ -n "$viewer_build_branch" ] +then + branch_viewer_channel_var="${viewer_build_branch}_viewer_channel" + if [ -n "${!branch_viewer_channel_var}" ] + then + viewer_channel="${!branch_viewer_channel_var}" + record_event "Overriding viewer_channel for branch '$changeset_branch' to '$viewer_channel'" + else + record_event "No branch-specific viewer_channel for branch '$viewer_build_branch'; to set a branch build channel set '$branch_viewer_channel_var'" + fi +fi +end_section "select viewer channel" + python_cmd "$helpers/codeticket.py" addinput "Viewer Channel" "${viewer_channel}" initialize_version # provided by buildscripts build.sh; sets version id |