Browse Source

Don't update Android version on pulls

QGC4.4
Don Gagne 4 years ago committed by Don Gagne
parent
commit
6643374ced
  1. 5
      .travis.yml

5
.travis.yml

@ -179,8 +179,9 @@ before_script: @@ -179,8 +179,9 @@ before_script:
export CONFIG=release;
fi
# insert QGC version in AndroidManifest.xml
- if [ "${SPEC}" = "android-clang" ]; then
# Update QGC version in AndroidManifest.xml based on git tag. We do not do this on pull requests
# since it is likely the tags out out of date on the pull and may cause an error.
- if [ "${SPEC}" = "android-clang" && "${TRAVIS_PULL_REQUEST}" = "false" ]]; then
git remote set-branches origin 'master' &&
git fetch --tags origin master &&
./tools/update_android_version.sh ${BITNESS} ${TRAVIS_BRANCH};

Loading…
Cancel
Save