Merge branch 'buildvendor'
This commit is contained in:
commit
63361be1c1
4
Makefile
4
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 \
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user