[ARVADOS-DEV] updated: b5494642ea862658418d2f9a419b10d1fe25431a

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-build-packages.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

       via  b5494642ea862658418d2f9a419b10d1fe25431a (commit)
      from  8003783f717ecb167a47c11d01f459b43670fd0e (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 b5494642ea862658418d2f9a419b10d1fe25431a
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Aug 28 11:37:35 2015 -0400

    Optimization: do not run bundle install for the API server package when
    we aren't including the vendor directory in the package we're building.
    
    No issue #

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index cd83513..fbd5fa5 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -584,7 +584,9 @@ if [[ ! -d "$WORKSPACE/services/api/tmp" ]]; then
 fi
 
 
-bundle install --path vendor/bundle >"$STDOUT_IF_DEBUG"
+if [[ "$BUILD_BUNDLE_PACKAGES" != 0 ]]; then
+  bundle install --path vendor/bundle >"$STDOUT_IF_DEBUG"
+fi
 
 /usr/bin/git rev-parse HEAD > git-commit.version
 
@@ -630,6 +632,8 @@ if [[ ! -d "$WORKSPACE/apps/workbench/tmp" ]]; then
   mkdir $WORKSPACE/apps/workbench/tmp
 fi
 
+# We need to bundle to be ready even when we build a package without vendor directory
+# because asset compilation requires it.
 bundle install --path vendor/bundle >"$STDOUT_IF_DEBUG"
 
 /usr/bin/git rev-parse HEAD > git-commit.version

-----------------------------------------------------------------------


hooks/post-receive
--