summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-09 19:19:49 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-04-02 16:42:43 +0300
commite9ea258bc0babc1459cc296c8d70785de40cc3ae (patch)
treea7015cf18e9644af871dde92881c1938db51d3b3
parenta6b99dbcb4ea69db73401a3101266ee49b88c9bc (diff)
Revert "Stop requiring BUGSPLAT_USER and BUGSPLAT_PASS in build.sh."
This reverts commit 66bf7d6892db950339861a716a78342ba84db746.
-rwxr-xr-xbuild.sh22
1 files changed, 22 insertions, 0 deletions
diff --git a/build.sh b/build.sh
index f7b3632ee8..22f9e0c78a 100755
--- a/build.sh
+++ b/build.sh
@@ -175,6 +175,28 @@ pre_build()
VIEWER_SYMBOL_FILE="$(native_path "$abs_build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.bz2")"
fi
+ # expect these variables to be set in the environment from GitHub secrets
+ if [[ -n "$BUGSPLAT_DB" ]]
+ then
+ # don't spew credentials into build log
+ set +x
+ if [[ -z "$BUGSPLAT_USER" || -z "$BUGSPLAT_PASS" ]]
+ then
+ # older mechanism involving build-secrets repo -
+ # if build_secrets_checkout isn't set, report its name
+ bugsplat_sh="${build_secrets_checkout:-\$build_secrets_checkout}/bugsplat/bugsplat.sh"
+ if [ -r "$bugsplat_sh" ]
+ then # show that we're doing this, just not the contents
+ echo source "$bugsplat_sh"
+ source "$bugsplat_sh"
+ else
+ fatal "BUGSPLAT_USER or BUGSPLAT_PASS missing, and no $bugsplat_sh"
+ fi
+ fi
+ set -x
+ export BUGSPLAT_USER BUGSPLAT_PASS
+ fi
+
# honor autobuild_configure_parameters same as sling-buildscripts
eval_autobuild_configure_parameters=$(eval $(echo echo $autobuild_configure_parameters))