Skip to content

Commit 966bd5c

Browse files
committed
Only do build (no collect) in a pull request
1 parent 9b1e6e4 commit 966bd5c

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

build.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,26 @@ REPO=`git config remote.origin.url`
66
SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:}
77
SHA=`git rev-parse --verify HEAD`
88

9-
git checkout master || git checkout --orphan master
10-
119
if [ "$TRAVIS_BRANCH" == "master" ]; then
1210
echo "This contains static files, not doing anything"
1311
exit 0
1412
fi
1513

1614
if [ "$TRAVIS_PULL_REQUEST" == "true" ]; then
17-
echo "This is a pull request"
18-
bundle exec rake collect
15+
echo "This is a pull request, just doing a build"
1916
bundle exec rake build
2017
exit 0
2118
fi
2219

2320
if [ "$TRAVIS_BRANCH" != "source" ]; then
24-
echo "Non source branch, building but not deploying"
21+
echo "Non source branch, collecting and building but not deploying"
2522
bundle exec rake collect
2623
bundle exec rake hash
2724
exit 0
2825
fi
2926

27+
git checkout master || git checkout --orphan master
28+
3029
bundle exec rake collect
3130
bundle exec rake build
3231

0 commit comments

Comments
 (0)