aboutsummaryrefslogtreecommitdiff
path: root/grunt
diff options
context:
space:
mode:
authorBardi Harborow <[email protected]>2017-03-21 18:18:11 +1100
committerBardi Harborow <[email protected]>2017-03-21 21:37:33 +1100
commitcab6f7d16ca64dfcb0de002940d085c8cfe8b304 (patch)
tree46380fdfc3c66535653b0e7170e6f6fa9eb77b57 /grunt
parent1ecb74e007b8f2c00f89ff083fb7732098d019f7 (diff)
downloadbootstrap-cab6f7d16ca64dfcb0de002940d085c8cfe8b304.tar.xz
bootstrap-cab6f7d16ca64dfcb0de002940d085c8cfe8b304.zip
More config tweaks.
Diffstat (limited to 'grunt')
-rw-r--r--grunt/configBridge.json10
-rwxr-xr-xgrunt/upload-preview.sh3
2 files changed, 1 insertions, 12 deletions
diff --git a/grunt/configBridge.json b/grunt/configBridge.json
deleted file mode 100644
index 140d9ab78..000000000
--- a/grunt/configBridge.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "paths": {
- "docsJs": [
- "assets/js/vendor/anchor.min.js",
- "assets/js/vendor/clipboard.min.js",
- "assets/js/vendor/holder.min.js",
- "assets/js/src/application.js"
- ]
- }
-}
diff --git a/grunt/upload-preview.sh b/grunt/upload-preview.sh
index 905d716ab..08e7fa2ef 100755
--- a/grunt/upload-preview.sh
+++ b/grunt/upload-preview.sh
@@ -6,8 +6,7 @@ if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ]; then exit 0; fi
# Add build metadata to version
sed -i "/^current_version:/ s/\$/+pr.${TRAVIS_COMMIT}/" _config.yml
# Fix URLs since the site's root is now a subdirectory
-echo "baseurl: /c/${TRAVIS_COMMIT}" >> _config.yml
-bundle exec jekyll build --destination "$TRAVIS_COMMIT"
+bundle exec jekyll build --destination "$TRAVIS_COMMIT" --baseurl "/c/${TRAVIS_COMMIT}"
# Install gcloud & gsutil
GSUTIL_VERSION=$(gsutil version | cut -d ' ' -f 3)