From d07751e8de8f9d137db07d62b64e6cf22cfaab7b Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Wed, 29 Mar 2017 16:42:22 -0700 Subject: add version string to ct2 results --- build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.sh b/build.sh index 9ca130b5d5..515b50670f 100755 --- a/build.sh +++ b/build.sh @@ -273,6 +273,13 @@ do else record_event "no autobuild metadata at '$build_dir/autobuild-package.xml'" fi + if [ -r "$build_dir/newview/viewer_version.txt" ] + then + begin_section "Viewer Version" + python_cmd "$helpers/codeticket.py" addoutput "Viewer Version" "$build_dir/newview/viewer_version.txt" --mimetype text/plain \ + || fatal "Upload of viewer version failed" + end_section "Viewer Version" + fi ;; Doxygen) if [ -r "$build_dir/doxygen_warnings.log" ] -- cgit v1.2.3 From c35fde6aafe0900075ce82669536465f1d389caf Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Thu, 30 Mar 2017 08:38:45 -0700 Subject: change mimetype to inline-text per review comment from Nat --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 515b50670f..6f11c72f75 100755 --- a/build.sh +++ b/build.sh @@ -276,7 +276,7 @@ do if [ -r "$build_dir/newview/viewer_version.txt" ] then begin_section "Viewer Version" - python_cmd "$helpers/codeticket.py" addoutput "Viewer Version" "$build_dir/newview/viewer_version.txt" --mimetype text/plain \ + python_cmd "$helpers/codeticket.py" addoutput "Viewer Version" "$build_dir/newview/viewer_version.txt" --mimetype inline-text \ || fatal "Upload of viewer version failed" end_section "Viewer Version" fi -- cgit v1.2.3 From 12893fd5ab17f6894652b8916d98cea9b3752952 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Thu, 30 Mar 2017 09:47:49 -0700 Subject: redirect file contents to stdout before passing to mimetype --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 6f11c72f75..4eba52d7a2 100755 --- a/build.sh +++ b/build.sh @@ -276,7 +276,7 @@ do if [ -r "$build_dir/newview/viewer_version.txt" ] then begin_section "Viewer Version" - python_cmd "$helpers/codeticket.py" addoutput "Viewer Version" "$build_dir/newview/viewer_version.txt" --mimetype inline-text \ + python_cmd "$helpers/codeticket.py" addoutput "Viewer Version" "$(<"$build_dir/newview/viewer_version.txt")" --mimetype inline-text \ || fatal "Upload of viewer version failed" end_section "Viewer Version" fi -- cgit v1.2.3