Skip to content

Commit

Permalink
fix deploy script
Browse files Browse the repository at this point in the history
  • Loading branch information
mrblueblue committed Sep 29, 2017
1 parent 7149d46 commit 4eb6bae
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 43 deletions.
42 changes: 1 addition & 41 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,4 @@
language: node_js
node_js: "8"
install: ./scripts/install.sh
after_success: |
CODECOV_TOKEN="3ec979ab-0d76-4383-91ae-68a214fc0156" npm run coverage
if [ "$TRAVIS_BRANCH" = "master" ]; then
[email protected]:mapd/mapd-data-layer.git
DOWNLOAD_PATH=examples
COMMIT_USER="mapd-bot"
COMMIT_EMAIL="[email protected]"
git config --global user.name "${COMMIT_USER}"
git config --global user.email "${COMMIT_EMAIL}"
rm -rf ${DOWNLOAD_PATH}
git clone "${REPO_PATH}" ${DOWNLOAD_PATH}
cd ${DOWNLOAD_PATH}
./scripts/install.sh
./scripts/build.sh
pushd examples/dc
yarn
popd
pushd examples/dc
yarn
popd
yarn webpack -- --config ./examples/dc/webpack.config.js
yarn webpack -- --config ./examples/vega/webpack.config.js
git fetch --all
git checkout gh-pages
git pull --rebase origin master
git add examples -f
CHANGESET=$(git rev-parse --verify HEAD)
git commit -m "Automated build for changeset ${CHANGESET}."
git push origin gh-pages
cd ..
rm -rf ${DOWNLOAD_PATH}
fi
after_success: ./scripts/deploy.sh
2 changes: 1 addition & 1 deletion examples/dc/src/count.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dispatch.on("setup", function setup() {
.html({
some: '<strong>%filter-count</strong> selected out of <strong>%total-count</strong> records' +
' | <a href=\'javascript:dc.filterAll(); dc.renderAll();\'>Reset All</a>',
all: 'All records selected. Please click on the graph to apply filters.'
all: 'All records selected. Cick on the graphs to apply filters.'
});

this.dataNode = xfilterNode.data({
Expand Down
2 changes: 1 addition & 1 deletion examples/vega/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
node_modules
assets/*.map
assets/
43 changes: 43 additions & 0 deletions scripts/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#!/bin/bash
set -ex

CODECOV_TOKEN="3ec979ab-0d76-4383-91ae-68a214fc0156" npm run coverage

if [ "$TRAVIS_BRANCH" = "master" ]; then
[email protected]:mapd/mapd-data-layer.git
DOWNLOAD_PATH=examples
COMMIT_USER="mapd-bot"
COMMIT_EMAIL="[email protected]"

git config --global user.name "${COMMIT_USER}"
git config --global user.email "${COMMIT_EMAIL}"
rm -rf ${DOWNLOAD_PATH}
git clone "${REPO_PATH}" ${DOWNLOAD_PATH}

cd ${DOWNLOAD_PATH}
./scripts/install.sh
./scripts/build.sh

pushd examples/dc
yarn
popd

pushd examples/vega
yarn
popd

yarn webpack -- --config ./examples/dc/webpack.config.js
yarn webpack -- --config ./examples/vega/webpack.config.js

git fetch --all
git checkout gh-pages
git pull --rebase origin master

git add examples -f
CHANGESET=$(git rev-parse --verify HEAD)

git commit -m "Automated build for changeset ${CHANGESET}."
git push origin gh-pages
cd ..
rm -rf ${DOWNLOAD_PATH}
fi

0 comments on commit 4eb6bae

Please sign in to comment.