From 3c0ecd357f4b4f01e709a6f7b774b85f0ff24540 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 21 May 2015 13:14:27 -0400 Subject: Remove support for parallel variant builds (never worked otherh than on linux, and maybe not there) --- build.sh | 46 +++++++--------------------------------------- 1 file changed, 7 insertions(+), 39 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index b66d1a0705..f3267e93b7 100755 --- a/build.sh +++ b/build.sh @@ -134,7 +134,7 @@ package_llphysicsextensions_tpv() echo "${autobuild_package_filename}" > $build_dir/llphysicsextensions_package fi else - echo "Do not provide llphysicsextensions_tpv for $variant" + record_event "Do not provide llphysicsextensions_tpv for $variant" llphysicsextensions_package="" fi end_section "PhysicsExtensions_TPV" @@ -155,7 +155,9 @@ build() # Run build extensions if [ $build_ok -eq 0 -a -d ${build_dir}/packages/build-extensions ]; then for extension in ${build_dir}/packages/build-extensions/*.sh; do + begin_section "Extension $extension" . $extension + end_section "Extension $extension" if [ $build_ok -ne 0 ]; then break fi @@ -259,57 +261,21 @@ do if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1 then - if $build_link_parallel - then - begin_section BuildParallel - ( build "$variant" "$build_dir" > "$build_dir/build.log" 2>&1 ) & - build_processes="$build_processes $!" - end_section BuildParallel - else begin_section "Build$variant" 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. + echo "so far so good" >> "$build_log" else record_failure "Build of \"$variant\" failed." fi end_section "Build$variant" - fi - else - record_failure "Build Prep for \"$variant\" failed." fi end_section "Do$variant" done build_docs -# If we are building variants in parallel, wait, then collect results. -# This requires that the build dirs are variant specific -if $build_link_parallel && [ x"$build_processes" != x ] -then - begin_section WaitParallel - wait $build_processes - for variant in $variants - do - eval '$build_'"$variant" || continue - eval '$build_'"$arch"_"$variant" || continue - - 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" | sed -n 's/^ *\(##teamcity.*\)/\1/p' - if `cat "$build_dir/build_ok"` - then - echo so far so good. - else - record_failure "Parallel build of \"$variant\" failed." - fi - end_section "Build$variant" - done - end_section WaitParallel -fi - # build debian package if [ "$arch" == "Linux" ] then @@ -376,7 +342,7 @@ then end_section "Upload Debian Repository" else - echo skipping debian build + echo debian build not enabled fi else echo skipping debian build due to failed build. @@ -446,7 +412,9 @@ then # Run upload extensions if [ -d ${build_dir}/packages/upload-extensions ]; then for extension in ${build_dir}/packages/upload-extensions/*.sh; do + begin_section "Upload Extenstion $extension" . $extension + end_section "Upload Extenstion $extension" done fi -- cgit v1.2.3 From 1c526c8df88bd2174749ffc6e784fab5527c0f43 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 27 May 2015 18:06:16 -0400 Subject: debugging addition for autobuild-package.xml --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index f3267e93b7..93f60ce201 100755 --- a/build.sh +++ b/build.sh @@ -180,7 +180,7 @@ build() build_docs() { begin_section "Building Documentation" - begin_section "Autobuild metadata" + begin_section "Autobuild metadata $(pwd)" if [ -r "$build_dir/autobuild-package.xml" ] then upload_item docs "$build_dir/autobuild-package.xml" text/xml -- cgit v1.2.3 From 919bea5645d0ec66e8d21a1b859671d11f7bb4a1 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 29 May 2015 13:32:52 -0400 Subject: rearrange upload of autobuild metadata in hopes of making it reliable --- build.sh | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 93f60ce201..45b11d4221 100755 --- a/build.sh +++ b/build.sh @@ -177,25 +177,6 @@ build() } # This is called from the branch independent script upon completion of all platform builds. -build_docs() -{ - begin_section "Building Documentation" - begin_section "Autobuild metadata $(pwd)" - if [ -r "$build_dir/autobuild-package.xml" ] - then - upload_item docs "$build_dir/autobuild-package.xml" text/xml - else - record_event "no metadata at '$build_dir/autobuild-package.xml'" - fi - end_section "Autobuild metadata" - if [ "$arch" != "Linux" ] - then - record_dependencies_graph # defined in build.sh - else - echo "TBD - skipping linux graph (probable python version dependency)" 1>&2 - fi - end_section "Building Documentation" -} # Check to see if we were invoked from the wrapper, if not, re-exec ourselves from there @@ -265,17 +246,35 @@ do 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" >> "$build_log" + if [ "$variant" == "Release" ] + then + if [ -r "$build_dir/autobuild-package.xml" ] + then + begin_section "Autobuild metadata" + record_event "Upload autobuild metadata" + upload_item docs "$build_dir/autobuild-package.xml" text/xml + if [ "$arch" != "Linux" ] + then + record_dependencies_graph # defined in buildscripts/hg/bin/build.sh + else + record_event "no dependency graph for linux (probable python version dependency)" 1>&2 + fi + end_section "Autobuild metadata" + else + record_event "no autobuild metadata at '$build_dir/autobuild-package.xml'" + fi + else + record_event "do not record autobuild metadata for $variant" + fi else record_failure "Build of \"$variant\" failed." fi + end_section "Build$variant" fi end_section "Do$variant" done -build_docs - # build debian package if [ "$arch" == "Linux" ] then -- cgit v1.2.3 From 67d496c7359dcde6e1c85dec26a5a92c747c2501 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sat, 30 May 2015 15:02:20 -0400 Subject: skip remaining variants once one variant build fails (fail early and often) --- build.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 45b11d4221..66ba3d86f3 100755 --- a/build.sh +++ b/build.sh @@ -273,6 +273,11 @@ do end_section "Build$variant" fi end_section "Do$variant" + if ! $succeeded + then + record_event "remaining variants skipped due to $variant failure" + break + fi done # build debian package -- cgit v1.2.3