From ca03a41564766d144cd39a2345890b198ddf98c5 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 28 Jul 2016 10:43:46 -0400 Subject: [PATCH 1/6] add test to build the default site --- script/cibuild | 1 + script/default-site | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100755 script/default-site diff --git a/script/cibuild b/script/cibuild index 59f4d1b2..4cdb6bac 100755 --- a/script/cibuild +++ b/script/cibuild @@ -9,6 +9,7 @@ then script/fmt script/test ci script/cucumber + script/default-site elif [[ -x "script/$TEST_SUITE" ]] then script/$TEST_SUITE diff --git a/script/default-site b/script/default-site new file mode 100755 index 00000000..b0bc96b8 --- /dev/null +++ b/script/default-site @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# Runs the `jekyll new` command and builds the default site as a sanity check + +set -e + +mkdir -p ./tmp +rm -Rf ./tmp/default-site + +bundle exec jekyll new tmp/default-site +cd tmp/default-site + +bundle exec jekyll build --verbose From 4278f856ef4d067377d2a5a48b015b0f984f6ead Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 28 Jul 2016 10:50:45 -0400 Subject: [PATCH 2/6] add default site test to travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f33cba09..38ac0587 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: matrix: - TEST_SUITE=test - TEST_SUITE=cucumber - + - TEST_SUITE=default-site branches: only: - master From bd96ca4ab6155262be41b06087ea2fea2d4a9c14 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 28 Jul 2016 14:15:48 -0400 Subject: [PATCH 3/6] bundle install before running bundle exec --- script/default-site | 1 + 1 file changed, 1 insertion(+) diff --git a/script/default-site b/script/default-site index b0bc96b8..f3733c96 100755 --- a/script/default-site +++ b/script/default-site @@ -9,4 +9,5 @@ rm -Rf ./tmp/default-site bundle exec jekyll new tmp/default-site cd tmp/default-site +bundle install bundle exec jekyll build --verbose From 4dab0c7da641ea0f54db4dec34b81ddcfd7f5fb1 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Mon, 1 Aug 2016 13:10:23 -0400 Subject: [PATCH 4/6] Only build default site once --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 38ac0587..747f6029 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,11 +15,12 @@ matrix: env: TEST_SUITE=fmt - rvm: jruby-9.0.5.0 env: TEST_SUITE=test + - rvm: 2.3.0 + env: TEST_SUITE=default-site env: matrix: - TEST_SUITE=test - TEST_SUITE=cucumber - - TEST_SUITE=default-site branches: only: - master From 4d0d528fd546f4602ceb17f8a2b042457b7a3b26 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 1 Aug 2016 14:49:52 -0700 Subject: [PATCH 5/6] script/default-site: give debug output --- script/default-site | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/script/default-site b/script/default-site index f3733c96..576f9117 100755 --- a/script/default-site +++ b/script/default-site @@ -3,11 +3,16 @@ set -e +echo "$0: setting up tmp directory" mkdir -p ./tmp rm -Rf ./tmp/default-site +echo "$0: creating new default site" bundle exec jekyll new tmp/default-site -cd tmp/default-site +pushd tmp/default-site +echo "$0: installing default site dependencies" bundle install +echo "$0: building the default site" bundle exec jekyll build --verbose +popd