Merge branch 'rvmsource'

This commit is contained in:
Saivann 2015-07-05 22:10:28 -04:00
commit 702c392eb2
No known key found for this signature in database
GPG key ID: 5780F5D31B5577B0
2 changed files with 4 additions and 4 deletions

View file

@ -5,8 +5,6 @@
PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/bin PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/bin
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' BUNDLE_DIR='/bitcoin.org/bundle'
@ -78,6 +76,7 @@ lasttime=`stat -c %Y "$SITEDIR/_buildlock" | cut -d ' ' -f1`
# Build website in a child process # Build website in a child process
( (
source /etc/profile.d/rvm.sh
cd $WORKDIR cd $WORKDIR
make deployment && touch "$WORKDIR/_builddone" || touch "$WORKDIR/_buildfail" make deployment && touch "$WORKDIR/_builddone" || touch "$WORKDIR/_buildfail"
)& )&
@ -96,6 +95,7 @@ do
if [ -e "$WORKDIR/_builddone" ]; then if [ -e "$WORKDIR/_builddone" ]; then
find $WORKDIR/_site \( -iname '*.html' -o -iname '*.css' -o -iname '*.js' -o -iname '*.rss' -o -iname '*.xml' -o -iname '*.svg' -o -iname '*.ttf' \) -exec gzip -9 -k {} \; find $WORKDIR/_site \( -iname '*.html' -o -iname '*.css' -o -iname '*.js' -o -iname '*.rss' -o -iname '*.xml' -o -iname '*.svg' -o -iname '*.ttf' \) -exec gzip -9 -k {} \;
rsync --delete -zrt $WORKDIR/_site/ $DESTDIR/ rsync --delete -zrt $WORKDIR/_site/ $DESTDIR/
echo "Upload done; terminating script"
exit exit
fi fi

View file

@ -5,8 +5,6 @@
PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/bin PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/bin
source /etc/profile.d/rvm.sh
# Set variables and create temporary directories # Set variables and create temporary directories
LANGS=('ar' 'bg' 'bn' 'ca' 'cs' 'da' 'de' 'el' 'es' 'fa' 'fr' 'hi' 'hr' 'hu' 'id' 'it' 'ja' 'ko' 'lv' 'ml' 'nl' 'no' 'pl' 'pt_BR' 'ro' 'ru' 'sl' 'sr' 'sv' 'tr' 'uk' 'zh_CN' 'zh_TW') LANGS=('ar' 'bg' 'bn' 'ca' 'cs' 'da' 'de' 'el' 'es' 'fa' 'fr' 'hi' 'hr' 'hu' 'id' 'it' 'ja' 'ko' 'lv' 'ml' 'nl' 'no' 'pl' 'pt_BR' 'ro' 'ru' 'sl' 'sr' 'sv' 'tr' 'uk' 'zh_CN' 'zh_TW')
WORKDIR=`mktemp -d` WORKDIR=`mktemp -d`
@ -92,6 +90,7 @@ done
# Build website in a child process # Build website in a child process
( (
source /etc/profile.d/rvm.sh
cd $WORKDIR cd $WORKDIR
bundle install bundle install
ENABLED_PLUGINS='alerts redirects releases' make build && touch "$WORKDIR/_builddone" || touch "$WORKDIR/_buildfail" ENABLED_PLUGINS='alerts redirects releases' make build && touch "$WORKDIR/_builddone" || touch "$WORKDIR/_buildfail"
@ -111,6 +110,7 @@ do
if [ -e "$WORKDIR/_builddone" ]; then if [ -e "$WORKDIR/_builddone" ]; then
cd $LIVEDIR cd $LIVEDIR
rsync --delete -zrt --exclude '/.git' $WORKDIR/_site/ $DESTDIR/ rsync --delete -zrt --exclude '/.git' $WORKDIR/_site/ $DESTDIR/
echo "Upload done; terminating script"
exit exit
fi fi