summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BuildParams5
-rwxr-xr-xbuild.sh4
2 files changed, 5 insertions, 4 deletions
diff --git a/BuildParams b/BuildParams
index 9433e335fe..ad2f71e336 100644
--- a/BuildParams
+++ b/BuildParams
@@ -14,8 +14,8 @@ public_build = true
# skip windows debug build until we can get a fix in.
build_CYGWIN_Debug = false
-# Update Public Inworld Build Status Indicators
-email_status_this_is_os = false
+# Update Public Inworld Build Status Indicators (setting should mirror "public_build")
+email_status_this_is_os = true
# Limit extent of codeticket updates to revisions after...
codeticket_since = 2.2.0-release
@@ -163,6 +163,7 @@ viewer-asset-delivery-metrics.build_server_tests = false
# Simon says
# ========================================
simon_viewer-dev-private.public_build = false
+simon_viewer-dev-private.email_status_this_is_os = false
# eof
diff --git a/build.sh b/build.sh
index 4268c76e78..c7c89fe3c2 100755
--- a/build.sh
+++ b/build.sh
@@ -209,7 +209,7 @@ do
end_section BuildParallel
else
begin_section "Build$variant"
- build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | grep --line-buffered "^##teamcity"
+ build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | sed -n 's/^ *\(##teamcity.*\)/\1/p'
if `cat "$build_dir/build_ok"`
then
echo so far so good.
@@ -238,7 +238,7 @@ then
begin_section "Build$variant"
build_dir=`build_dir_$arch $variant`
build_dir_stubs="$build_dir/win_setup/$variant"
- tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity"
+ tee -a $build_log < "$build_dir/build.log" | sed -n 's/^ *\(##teamcity.*\)/\1/p'
if `cat "$build_dir/build_ok"`
then
echo so far so good.