joshua/dash-docs
1
0
Fork 0
mirror of https://github.com/seigler/dash-docs synced 2025-07-27 01:36:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use BUNDLE_DIR to define bundler's directory

Browse source
This commit is contained in:
Saivann 2015-07-04 16:09:57 -04:00
parent 15c0c2626e
commit 4e409097da
No known key found for this signature in database
GPG key ID: 5780F5D31B5577B0
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -45,7 +45,11 @@ install-deps-development:
## Install dependencies (deployment version) ## Install dependencies (deployment version)
install-deps-deployment: install-deps-deployment:
ifdef BUNDLE_DIR
bundle install --deployment --without :slow_test --path=$(BUNDLE_DIR)
else
bundle install --deployment --without :slow_test 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 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 \ pre-build-tests-fast: check-for-non-ascii-urls check-for-wrong-filename-assignments \

5
_build/update_site.sh
View file

@ -9,10 +9,13 @@ source /etc/profile.d/rvm.sh
AUTHORIZED_SIGNERS_DIR='/bitcoin.org/auto-build-committers.gnupg' AUTHORIZED_SIGNERS_DIR='/bitcoin.org/auto-build-committers.gnupg'
REPO='https://github.com/bitcoin-dot-org/bitcoin.org.git' REPO='https://github.com/bitcoin-dot-org/bitcoin.org.git'
BUNDLE_DIR='/bitcoin.org/bundle'
SITEDIR='/bitcoin.org/site' SITEDIR='/bitcoin.org/site'
DESTDIR='build@bitcoinorgsite:/var/www/site' DESTDIR='build@bitcoinorgsite:/var/www/site'
WORKDIR=`mktemp -d` WORKDIR=`mktemp -d`
export BUNDLE_DIR
# Stop script in case a single command fails # Stop script in case a single command fails
set -e set -e
@ -38,7 +41,7 @@ fi
# Update local branch # Update local branch
git reset --hard origin/master git reset --hard origin/master
git clean -f -d git clean -x -f -d
## Whether to auto-build or force-build ## Whether to auto-build or force-build
case "${1:-nil}" in case "${1:-nil}" in