Skip to content
Snippets Groups Projects
Commit 363e296d authored by Merov Linden's avatar Merov Linden
Browse files

STORM-1190 : pull into viewer-development

parents b4cbe982 2417cb30
No related branches found
No related tags found
No related merge requests found
...@@ -118,11 +118,12 @@ eval '$build_'"$arch" || pass ...@@ -118,11 +118,12 @@ eval '$build_'"$arch" || pass
# File no longer exists in code-sep branch, so let's make sure it exists in order to use it. # File no longer exists in code-sep branch, so let's make sure it exists in order to use it.
if test -f scripts/update_version_files.py ; then if test -f scripts/update_version_files.py ; then
begin_section UpdateVer begin_section UpdateVer
python scripts/update_version_files.py \ eval $(python scripts/update_version_files.py \
--channel="$viewer_channel" \ --channel="$viewer_channel" \
--server_channel="$server_channel" \ --server_channel="$server_channel" \
--revision=$revision \ --revision=$revision \
--verbose \ --verbose \
| sed -n -e "s,Setting viewer channel/version: '\([^']*\)' / '\([^']*\)',VIEWER_CHANNEL='\1';VIEWER_VERSION='\2',p")\
|| fail update_version_files.py || fail update_version_files.py
end_section UpdateVer end_section UpdateVer
fi fi
...@@ -262,6 +263,9 @@ then ...@@ -262,6 +263,9 @@ then
upload_item installer "$package" binary/octet-stream upload_item installer "$package" binary/octet-stream
upload_item quicklink "$package" binary/octet-stream upload_item quicklink "$package" binary/octet-stream
echo "{\"Type\":\"viewer\",\"Version\":\"${VIEWER_VERSION}\"}" > summary.json
upload_item installer summary.json text/plain
# Upload crash reporter files. # Upload crash reporter files.
case "$last_built_variant" in case "$last_built_variant" in
Release) Release)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment