From 4e409097da6138b927ac03a2979e0c63de037ee7 Mon Sep 17 00:00:00 2001 From: Saivann Date: Sat, 4 Jul 2015 16:09:57 -0400 Subject: [PATCH] Use BUNDLE_DIR to define bundler's directory --- Makefile | 4 ++++ _build/update_site.sh | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fc24cad2..35e08e5f 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,11 @@ install-deps-development: ## Install dependencies (deployment version) install-deps-deployment: +ifdef BUNDLE_DIR + bundle install --deployment --without :slow_test --path=$(BUNDLE_DIR) +else bundle install --deployment --without :slow_test +endif ## Pre-build tests which, aggregated together, take less than 10 seconds to run on a typical PC pre-build-tests-fast: check-for-non-ascii-urls check-for-wrong-filename-assignments \ diff --git a/_build/update_site.sh b/_build/update_site.sh index cba8aded..d298b34b 100755 --- a/_build/update_site.sh +++ b/_build/update_site.sh @@ -9,10 +9,13 @@ source /etc/profile.d/rvm.sh AUTHORIZED_SIGNERS_DIR='/bitcoin.org/auto-build-committers.gnupg' REPO='https://github.com/bitcoin-dot-org/bitcoin.org.git' +BUNDLE_DIR='/bitcoin.org/bundle' SITEDIR='/bitcoin.org/site' DESTDIR='build@bitcoinorgsite:/var/www/site' WORKDIR=`mktemp -d` +export BUNDLE_DIR + # Stop script in case a single command fails set -e @@ -38,7 +41,7 @@ fi # Update local branch git reset --hard origin/master -git clean -f -d +git clean -x -f -d ## Whether to auto-build or force-build case "${1:-nil}" in