mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-16 00:03:12 -04:00
fix list of updated files in pull requests
This commit is contained in:
parent
b93ec5dbcb
commit
d94cf12dea
@ -8,7 +8,7 @@ cd $(git rev-parse --show-toplevel)
|
|||||||
if [[ ! -z $TRAVIS_PULL_REQUEST_BRANCH ]]; then
|
if [[ ! -z $TRAVIS_PULL_REQUEST_BRANCH ]]; then
|
||||||
# if on a PR, just analyze the changed files
|
# if on a PR, just analyze the changed files
|
||||||
echo "TRAVIS PR BRANCH: $TRAVIS_PULL_REQUEST_BRANCH"
|
echo "TRAVIS PR BRANCH: $TRAVIS_PULL_REQUEST_BRANCH"
|
||||||
FILES=$(git diff --diff-filter=AM --name-only $(git merge-base HEAD master) | tr '\n' ' ' )
|
FILES=$(git diff --diff-filter=AM --name-only $(git merge-base HEAD ${TRAVIS_BRANCH}) | tr '\n' ' ' )
|
||||||
export PATH=${HOME}/osgeo4travis/bin:${PATH}
|
export PATH=${HOME}/osgeo4travis/bin:${PATH}
|
||||||
elif [[ ! -z $TRAVIS_COMMIT_RANGE ]]; then
|
elif [[ ! -z $TRAVIS_COMMIT_RANGE ]]; then
|
||||||
echo "TRAVIS COMMIT RANGE: $TRAVIS_COMMIT_RANGE"
|
echo "TRAVIS COMMIT RANGE: $TRAVIS_COMMIT_RANGE"
|
||||||
|
@ -22,7 +22,7 @@ ASTYLEDIFF=/tmp/astyle.diff
|
|||||||
if [[ ! -z $TRAVIS_PULL_REQUEST_BRANCH ]]; then
|
if [[ ! -z $TRAVIS_PULL_REQUEST_BRANCH ]]; then
|
||||||
# if on a PR, just analyze the changed files
|
# if on a PR, just analyze the changed files
|
||||||
echo "TRAVIS PR BRANCH: $TRAVIS_PULL_REQUEST_BRANCH"
|
echo "TRAVIS PR BRANCH: $TRAVIS_PULL_REQUEST_BRANCH"
|
||||||
FILES=$(git diff --diff-filter=AM --name-only $(git merge-base HEAD master) | tr '\n' ' ' )
|
FILES=$(git diff --diff-filter=AM --name-only $(git merge-base HEAD ${TRAVIS_BRANCH}) | tr '\n' ' ' )
|
||||||
elif [[ ! -z $TRAVIS_COMMIT_RANGE ]]; then
|
elif [[ ! -z $TRAVIS_COMMIT_RANGE ]]; then
|
||||||
echo "TRAVIS COMMIT RANGE: $TRAVIS_COMMIT_RANGE"
|
echo "TRAVIS COMMIT RANGE: $TRAVIS_COMMIT_RANGE"
|
||||||
FILES=$(git diff --diff-filter=AM --name-only ${TRAVIS_COMMIT_RANGE/.../..} | tr '\n' ' ' )
|
FILES=$(git diff --diff-filter=AM --name-only ${TRAVIS_COMMIT_RANGE/.../..} | tr '\n' ' ' )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user