From 6643374cedb6e062f8622aabd6b22a513bb5bc24 Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Tue, 26 Jan 2021 10:02:26 -0800
Subject: [PATCH] Don't update Android version on pulls

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1f76495..94fec92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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};