From 0f56e41e8f00593646fc4020475f2461bc42292c Mon Sep 17 00:00:00 2001 From: Noah Zoschke Date: Wed, 18 May 2011 09:08:07 -0700 Subject: [PATCH] compile hook poc; source PIP_OPTS from Makefile if present --- bin/compile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index dfc655e..54223de 100755 --- a/bin/compile +++ b/bin/compile @@ -1,6 +1,7 @@ #!/usr/bin/env bash # bin/compile +set -x set -e set -o pipefail @@ -19,6 +20,9 @@ function sed() { cd $BUILD_DIR +# COMPILE HOOK: export build environment if specified +(make environment 2> /dev/null) && eval $(make environment) + # copy artifacts out of cache if exists mkdir -p $CACHE_DIR for dir in $VIRTUALENV_DIRS; do @@ -45,7 +49,7 @@ if [ "$NAME" = "Python/Django" ]; then fi echo "-----> Installing dependencies using pip version $(pip --version | awk '{print $2}')" -PIP_DOWNLOAD_CACHE=$PIP_DOWNLOAD_CACHE bin/pip install -r requirements.txt | sed -u 's/^/ /' +PIP_DOWNLOAD_CACHE=$PIP_DOWNLOAD_CACHE bin/pip install -r requirements.txt ${PIP_OPTS} | sed -u 's/^/ /' # store new artifacts in cache for dir in $VIRTUALENV_DIRS; do