diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2014-08-11 16:47:08 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-08-11 16:47:08 +0400 |
| commit | aa326526bdb3c30b677976d6b8ccff33f6bb65cc (patch) | |
| tree | b83f8023393fa314a76df70cbf9e5cbbb353cf8d /tests | |
| parent | 00202ceebd7adff540a1e471cd0a4070219c7c22 (diff) | |
Use correct path to existing .travis.yml when running autoupdate .travis.yml script for a plugin.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/travis/autoupdate_travis_yml.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/travis/autoupdate_travis_yml.sh b/tests/travis/autoupdate_travis_yml.sh index 827d16dff1..119dc79c8f 100755 --- a/tests/travis/autoupdate_travis_yml.sh +++ b/tests/travis/autoupdate_travis_yml.sh @@ -8,9 +8,15 @@ if ! $GENERATE_TRAVIS_YML_COMMAND; then exit 1 fi -echo "Diffing generated with existing..." +if [ "$PLUGIN_NAME" != "" ]; then + EXISTING_YML_PATH=plugins/$PLUGIN_NAME/.travis.yml +else + EXISTING_YML_PATH=.travis.yml +fi + +echo "Diffing generated with existing (located at $EXISTING_YML_PATH)..." -diff .travis.yml generated.travis.yml +diff $EXISTING_YML_PATH generated.travis.yml > /dev/null DIFF_RESULT=$? echo "" |