projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '21705-go121'
[arvados.git]
/
build
/
run-build-packages-one-target.sh
diff --git
a/build/run-build-packages-one-target.sh
b/build/run-build-packages-one-target.sh
index 22d6dc43f498d29455eba8a5bf9b468718550d77..b1801dd307a1ac34591e5ef2b0169bdba5a92ddb 100755
(executable)
--- a/
build/run-build-packages-one-target.sh
+++ b/
build/run-build-packages-one-target.sh
@@
-206,11
+206,10
@@
JENKINS_DIR=$(dirname "$(readlink -e "$0")")
if [[ "$SKIP_DOCKER_BUILD" != 1 ]] ; then
if [[ -n "$test_packages" ]]; then
if [[ "$SKIP_DOCKER_BUILD" != 1 ]] ; then
if [[ -n "$test_packages" ]]; then
- pushd "$JENKINS_DIR/package-test-dockerfiles"
- make "$TARGET/generated"
+ pushd "$JENKINS_DIR/package-test-dockerfiles"
else
else
- pushd "$JENKINS_DIR/package-build-dockerfiles"
- make "$TARGET/generated"
+
pushd "$JENKINS_DIR/package-build-dockerfiles"
+
make "$TARGET/generated"
fi
GOVERSION=$(grep 'const goversion =' $WORKSPACE/lib/install/deps.go |awk -F'"' '{print $2}')
fi
GOVERSION=$(grep 'const goversion =' $WORKSPACE/lib/install/deps.go |awk -F'"' '{print $2}')
@@
-231,7
+230,6
@@
if test -z "$packages" ; then
arvados-dispatch-cloud
arvados-dispatch-lsf
arvados-docker-cleaner
arvados-dispatch-cloud
arvados-dispatch-lsf
arvados-docker-cleaner
- arvados-git-httpd
arvados-health
arvados-server
arvados-src
arvados-health
arvados-server
arvados-src