diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-12 23:05:07 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-12 23:13:12 +0300 |
commit | 97f09de4fcbe2a789d01ed362d6acfcac6b007b3 (patch) | |
tree | b35db61d9bf9902d443043d289f57f6f70334678 /build.sh | |
parent | 54171dbc9fe3fa42ebbf59a243b7381fdb3aa662 (diff) | |
parent | c40b8310b00f1d620a2f5a94f2514c8bf3531373 (diff) |
Merge branch 'master' into DRTVWR-520-apple-notarization
# Conflicts:
# autobuild.xml
# build.sh
# indra/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 19 |
1 files changed, 13 insertions, 6 deletions
@@ -152,11 +152,6 @@ pre_build() then # show that we're doing this, just not the contents echo source "$bugsplat_sh" source "$bugsplat_sh" - # important: we test this and use its value in [grand-]child processes - if [ -n "${BUGSPLAT_DB:-}" ] - then echo export BUGSPLAT_DB - export BUGSPLAT_DB - fi fi set -x @@ -452,6 +447,15 @@ then fi fi +# Some of the uploads takes a long time to finish in the codeticket backend, +# causing the next codeticket upload attempt to fail. +# Inserting this after each potentially large upload may prevent those errors. +# JJ is making changes to Codeticket that we hope will eliminate this failure, then this can be removed +wait_for_codeticket() +{ + sleep $(( 60 * 6 )) +} + # check status and upload results to S3 if $succeeded then @@ -468,6 +472,7 @@ then # Upload base package. retry_cmd 4 30 python_cmd "$helpers/codeticket.py" addoutput Installer "$package" \ || fatal "Upload of installer failed" + wait_for_codeticket # Upload additional packages. for package_id in $additional_packages @@ -477,6 +482,7 @@ then then retry_cmd 4 30 python_cmd "$helpers/codeticket.py" addoutput "Installer $package_id" "$package" \ || fatal "Upload of installer $package_id failed" + wait_for_codeticket else record_failure "Failed to find additional package for '$package_id'." fi @@ -490,6 +496,7 @@ then # Upload crash reporter file retry_cmd 4 30 python_cmd "$helpers/codeticket.py" addoutput "Symbolfile" "$VIEWER_SYMBOL_FILE" \ || fatal "Upload of symbolfile failed" + wait_for_codeticket fi # Upload the llphysicsextensions_tpv package, if one was produced @@ -509,6 +516,7 @@ then begin_section "Upload Extension $extension" . $extension [ $? -eq 0 ] || fatal "Upload of extension $extension failed" + wait_for_codeticket end_section "Upload Extension $extension" done fi @@ -518,7 +526,6 @@ then record_event "skipping upload of installer" fi - else record_event "skipping upload of installer due to failed build" fi |