Skip to content

Commit 39ea42c

Browse files
fugledefuglede
committed
Make ruleset fetch test Travis specific
This renames the pre-commit test to reflect that it is now Travis specific; rather than the contents of the previous commit, this checks the current branch against the EFForg GitHub repository master branch.
1 parent 6fd03a3 commit 39ea42c

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ before_script:
3232
- mv chromedriver test/chromium/chromedriver
3333
script:
3434
- ./test.sh
35-
- test/commit.sh
35+
- test/travis-ruleset-fetch.sh
3636
sudo: false
3737
notifications:
3838
email:

test/commit.sh renamed to test/travis-ruleset-fetch.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ else
1717
git rev-parse && cd "$(git rev-parse --show-toplevel)"
1818
fi
1919

20-
RULESETS_CHANGED=$(git diff --name-only HEAD | grep $RULESETFOLDER | grep '.xml')
20+
# Fetch the current GitHub version of HTTPS-E to compare to its master
21+
git remote add upstream-for-travis https://github.com/EFForg/https-everywhere.git
22+
git fetch upstream-for-travis master
23+
RULESETS_CHANGED=$(git diff --name-only upstream-for-travis/master | grep $RULESETFOLDER | grep '.xml')
24+
git remote remove upstream-for-travis
2125

2226
# Only run test if something has changed.
2327
if [ "$RULESETS_CHANGED" ]; then

0 commit comments

Comments
 (0)