From: Ward Vandewege Date: Tue, 5 Dec 2017 21:14:27 +0000 (-0500) Subject: Small build script fixes. X-Git-Tag: 1.1.2~27 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ceb1d9dc3bb2f80faf1a005a21ea687108841f40?hp=50b36937d0bd921a9c3dc27080e0a3d7591b465a Small build script fixes. No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh index 7f75624af6..0db305114e 100755 --- a/build/run-build-packages-one-target.sh +++ b/build/run-build-packages-one-target.sh @@ -97,6 +97,15 @@ set -e if [[ -n "$test_packages" ]]; then if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.rpm')" ]] ; then + set +e + /usr/bin/which createrepo >/dev/null + if [[ "$?" != "0" ]]; then + echo >&2 + echo >&2 "Error: please install createrepo. E.g. sudo apt-get install createrepo" + echo >&2 + exit 1 + fi + set -e createrepo $WORKSPACE/packages/$TARGET fi diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh index 6beec1d915..57e99e809c 100755 --- a/build/run-build-packages.sh +++ b/build/run-build-packages.sh @@ -340,7 +340,7 @@ fi # Go binaries cd $WORKSPACE/packages/$TARGET export GOPATH=$(mktemp -d) -go get -v github.com/kardianos/govendor +go get github.com/kardianos/govendor package_go_binary sdk/go/crunchrunner crunchrunner \ "Crunchrunner executes a command inside a container and uploads the output" package_go_binary services/arv-git-httpd arvados-git-httpd \