From b76486d66eb638e946a57c758ecbf0395e193909 Mon Sep 17 00:00:00 2001 From: davemachado Date: Thu, 26 Oct 2017 12:19:07 -0400 Subject: [PATCH] Move json into PR-only branch --- build/main.sh | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/build/main.sh b/build/main.sh index 93bc2f74..f95a2278 100755 --- a/build/main.sh +++ b/build/main.sh @@ -2,53 +2,53 @@ FORMAT_FILE=../README.md if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then - echo "running on $TRAVIS_BRANCH branch" - LINK_FILE=../README.md + echo "running on $TRAVIS_BRANCH branch" + LINK_FILE=../README.md else - echo "running on Pull Request #$TRAVIS_PULL_REQUEST" - DIFF_URL="https://patch-diff.githubusercontent.com/raw/toddmotto/public-apis/pull/$TRAVIS_PULL_REQUEST.diff" - curl $DIFF_URL > diff.txt - echo "------- BEGIN DIFF -------" - cat diff.txt - echo "-------- END DIFF --------" - cat diff.txt | egrep "\+" > additions.txt - echo "------ BEGIN ADDITIONS -----" - cat additions.txt - echo "------- END ADDITIONS ------" - LINK_FILE=additions.txt -fi + echo "running on Pull Request #$TRAVIS_PULL_REQUEST" + DIFF_URL="https://patch-diff.githubusercontent.com/raw/toddmotto/public-apis/pull/$TRAVIS_PULL_REQUEST.diff" + curl $DIFF_URL > diff.txt + echo "------- BEGIN DIFF -------" + cat diff.txt + echo "-------- END DIFF --------" + cat diff.txt | egrep "\+" > additions.txt + echo "------ BEGIN ADDITIONS -----" + cat additions.txt + echo "------- END ADDITIONS ------" + LINK_FILE=additions.txt -echo "checking if /json was changed..." -egrep "\+{3}\s.\/json\/" diff.txt > json.txt -if [ $? -eq 0 ]; then + echo "checking if /json was changed..." + if egrep "\+{3}\s.\/json\/" diff.txt > json.txt; then echo "JSON files are auto-generated! Please do not update these files:" cat json.txt exit 1 -else + else echo "/json check passed!" rm json.txt + fi + fi echo "running format validation..." ./validate_format.rb $FORMAT_FILE if [[ $? != 0 ]]; then - echo "format validation failed!" - exit 1 + echo "format validation failed!" + exit 1 else - echo "format validation passed!" - ./build.sh && ./deploy.sh - if [[ $? != 0 ]]; then - echo "JSON build and deploy failed!" - else - echo "JSON build and deploy success!" - fi + echo "format validation passed!" + ./build.sh && ./deploy.sh + if [[ $? != 0 ]]; then + echo "JSON build and deploy failed!" + else + echo "JSON build and deploy success!" + fi fi echo "running link validation..." ./validate_links.rb $LINK_FILE if [[ $? != 0 ]]; then - echo "link validation failed!" - exit 1 + echo "link validation failed!" + exit 1 else - echo "link validation passed!" + echo "link validation passed!" fi