From c1b906c368478ee50a635d2ffd0cc7069ae143cb Mon Sep 17 00:00:00 2001 From: Dave Machado Date: Fri, 21 Jul 2017 14:45:05 -0400 Subject: [PATCH 1/4] set variable for file to check --- build/main.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/main.sh b/build/main.sh index 62636aa2..f089ce12 100755 --- a/build/main.sh +++ b/build/main.sh @@ -1,6 +1,7 @@ #!/bin/bash +CHECK_FILE=../README.md echo "running format validation..." -./validate_format.rb ../README.md +./validate_format.rb $CHECK_FILE if [[ $? != 0 ]]; then echo "format validation failed!" exit 1 @@ -10,7 +11,7 @@ fi if [ "$TRAVIS_BRANCH" == "master" ]; then echo "running link validation..." - ./validate_links.rb ../README.md + ./validate_links.rb $CHECK_FILE if [[ $? != 0 ]]; then echo "link validation failed!" exit 1 From 530d404408348719e06471655f40abad450a9696 Mon Sep 17 00:00:00 2001 From: Dave Machado Date: Fri, 21 Jul 2017 14:47:59 -0400 Subject: [PATCH 2/4] set PR additions file as link validation file --- build/main.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/build/main.sh b/build/main.sh index f089ce12..8cadd34f 100755 --- a/build/main.sh +++ b/build/main.sh @@ -1,7 +1,16 @@ #!/bin/bash -CHECK_FILE=../README.md +FORMAT_FILE=../README.md +if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then + echo "running on Pull Request #$TRAVIS_PULL_REQUEST" + git show | egrep "\+" > additions.txt + LINK_FILE=additions.txt +else + echo "running on $TRAVIS_BRANCH branch" + LINK_FILE=../README.md +fi + echo "running format validation..." -./validate_format.rb $CHECK_FILE +./validate_format.rb $FORMAT_FILE if [[ $? != 0 ]]; then echo "format validation failed!" exit 1 @@ -11,7 +20,7 @@ fi if [ "$TRAVIS_BRANCH" == "master" ]; then echo "running link validation..." - ./validate_links.rb $CHECK_FILE + ./validate_links.rb $LINK_FILE if [[ $? != 0 ]]; then echo "link validation failed!" exit 1 From ab5d27c575de36bd649981ab957d3f32546c1421 Mon Sep 17 00:00:00 2001 From: Dave Machado Date: Fri, 21 Jul 2017 14:51:23 -0400 Subject: [PATCH 3/4] print out additions being validated --- build/main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/main.sh b/build/main.sh index 8cadd34f..1da22e1e 100755 --- a/build/main.sh +++ b/build/main.sh @@ -3,6 +3,8 @@ FORMAT_FILE=../README.md if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then echo "running on Pull Request #$TRAVIS_PULL_REQUEST" git show | egrep "\+" > additions.txt + echo "--ADDITIONS--" + cat additions.txt LINK_FILE=additions.txt else echo "running on $TRAVIS_BRANCH branch" From 90e4670ce40d1d776480aeab1d737c64b3918a5f Mon Sep 17 00:00:00 2001 From: Dave Machado Date: Fri, 21 Jul 2017 14:59:33 -0400 Subject: [PATCH 4/4] check for no links in link file and fail if not pull request --- build/main.sh | 3 +++ build/validate_links.rb | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/build/main.sh b/build/main.sh index 1da22e1e..bc46dfdf 100755 --- a/build/main.sh +++ b/build/main.sh @@ -27,6 +27,9 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then echo "link validation failed!" exit 1 else + if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then + echo "no links to check on $TRAVIS_BRANCH branch - script failure!" + fi echo "link validation passed!" fi fi diff --git a/build/validate_links.rb b/build/validate_links.rb index a3f318e2..5bf27cae 100755 --- a/build/validate_links.rb +++ b/build/validate_links.rb @@ -17,6 +17,10 @@ raw_links.each do |link| links.push(link) end end +if links.length <= 0 + puts "no links to check" + exit(0) +end fails = [] # Fail on any duplicate elements dup = links.select{|element| links.count(element) > 1}