[ARVADOS] updated: 1.3.0-1462-g2774e45ab
Git user
git at public.curoverse.com
Tue Aug 13 15:26:48 UTC 2019
Summary of changes:
build/run-build-packages.sh | 4 ++--
build/run-build-test-packages-one-target.sh | 12 +++++++++---
build/run-library.sh | 6 ++++++
3 files changed, 17 insertions(+), 5 deletions(-)
via 2774e45aba64557259fc35155c62988449a8dc72 (commit)
from 366a2efdd0ac4630f4381f3b47d70ef155ed2df4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 2774e45aba64557259fc35155c62988449a8dc72
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date: Tue Aug 13 10:36:53 2019 -0400
15516: various fixes:
* make it possible to supply --debug to run-build-test-packages-one-target.sh
* replace hardcoded /dev/null in a few places in run-build-packages.sh
* make sure get_complete_package_name() does not abort the program when optional
parameters are not supplied, in the case where set -e is set
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 8df8f981d..ac11971e8 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -409,8 +409,8 @@ if [[ "$?" == "0" ]] ; then
mv /tmp/x /etc/arvados/config.yml
perl -p -i -e 'BEGIN{undef $/;} s/WebDAV(.*?):\n( *)ExternalURL: ""/WebDAV$1:\n$2ExternalURL: "example.com"/g' /etc/arvados/config.yml
- RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake npm:install >/dev/null
- RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake assets:precompile >/dev/null
+ RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake npm:install >"$STDOUT_IF_DEBUG"
+ RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake assets:precompile >"$STDOUT_IF_DEBUG"
# Remove generated configuration files so they don't go in the package.
rm -rf /etc/arvados/
diff --git a/build/run-build-test-packages-one-target.sh b/build/run-build-test-packages-one-target.sh
index 962940b79..d75e2785e 100755
--- a/build/run-build-test-packages-one-target.sh
+++ b/build/run-build-test-packages-one-target.sh
@@ -14,6 +14,8 @@ Syntax:
--upload
If the build and test steps are successful, upload the packages
to a remote apt repository (default: false)
+--debug
+ Output debug information (default: false)
--rc
Optional Parameter to build Release Candidate
--build-version <version>
@@ -42,7 +44,7 @@ if ! [[ -d "$WORKSPACE" ]]; then
fi
PARSEDOPTS=$(getopt --name "$0" --longoptions \
- help,upload,rc,target:,build-version: \
+ help,debug,upload,rc,target:,build-version: \
-- "" "$@")
if [ $? -ne 0 ]; then
exit 1
@@ -51,6 +53,7 @@ fi
TARGET=debian9
UPLOAD=0
RC=0
+DEBUG=
declare -a build_args=()
@@ -65,6 +68,9 @@ while [ $# -gt 0 ]; do
--target)
TARGET="$2"; shift
;;
+ --debug)
+ DEBUG=" --debug"
+ ;;
--upload)
UPLOAD=1
;;
@@ -99,7 +105,7 @@ COLUMNS=80
title "Start build packages"
timer_reset
-$WORKSPACE/build/run-build-packages-one-target.sh "${build_args[@]}"
+$WORKSPACE/build/run-build-packages-one-target.sh "${build_args[@]}"$DEBUG
checkexit $? "build packages"
title "End of build packages (`timer`)"
@@ -108,7 +114,7 @@ title "Start test packages"
timer_reset
if [ ${#failures[@]} -eq 0 ]; then
- $WORKSPACE/build/run-build-packages-one-target.sh "${build_args[@]}" --test-packages
+ $WORKSPACE/build/run-build-packages-one-target.sh "${build_args[@]}" --test-packages$DEBUG
else
echo "Skipping package upload, there were errors building the packages"
fi
diff --git a/build/run-library.sh b/build/run-library.sh
index af95cdc60..e0b7a0b97 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -226,6 +226,12 @@ test_rails_package_presence() {
}
get_complete_package_name() {
+ # if the errexit flag is set, unset it until this function returns
+ # otherwise, the shift calls below will abort the program if optional arguments are not supplied
+ if [ -o errexit ]; then
+ set +e
+ trap 'set -e' RETURN
+ fi
local -n __returnvar="$1"; shift
local pkgname="$1"; shift
local version="$1"; shift
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list