travis: Unshallow/get tags earlier.

* Fixes the version embedding into the firmware.
timvideos · Jan 27, 2016 · 4acd999 · 4acd999
1 parent 8c5c7ce
commit 4acd999
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.travis/run.sh b/.travis/run.sh
@@ -96,18 +96,11 @@ for BOARD in $BOARDS; do
 				echo "- No Github token so unable to copy built files"
 			fi
 		else
-			echo ""
-			echo ""
-			echo ""
-			echo "- Fetching non shallow to get git version"
-			echo "---------------------------------------------"
-			git fetch --unshallow && git fetch --tags
-			GIT_REVISION=`git describe`
-			echo "============================================="
 			# Look at repo we are running in to determine where to try pushing to if in a fork
 			COPY_REPO_OWNER=$(echo $TRAVIS_REPO_SLUG|awk -F'/' '{print $1}')
 			echo "COPY_REPO_OWNER = $COPY_REPO_OWNER"
 			COPY_REPO="HDMI2USB-firmware-prebuilt"
+			GIT_REVISION=`git describe`
 			COPY_DEST="archive/$GIT_REVISION/$BOARD/$TARGET"
 			ORIG_COMMITTER_NAME=$(git log -1 --pretty=%an)
 			ORIG_COMMITTER_EMAIL=$(git log -1 --pretty=%ae)

diff --git a/.travis/setup.sh b/.travis/setup.sh
@@ -3,6 +3,15 @@
 set -x
 set -e
 
+echo ""
+echo ""
+echo ""
+echo "- Fetching non shallow to get git version"
+echo "---------------------------------------------"
+git fetch --unshallow && git fetch --tags
+GIT_REVISION=`git describe`
+echo "============================================="
+
 # Run the script once to check it works
 time scripts/get-env.sh
 # Run the script again to check it doesn't break things