From cdcf2c061c9532ff932a5de0bab38d77e63fc75e Mon Sep 17 00:00:00 2001
From: Tim 'mithro' Ansell <me@mith.ro>
Date: Thu, 21 Dec 2017 13:22:34 +0100
Subject: [PATCH] travis: Get tags so git-describe works.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
---
 .travis.yml              |  1 +
 .travis/fix-git.sh       |  3 +++
 .travis/generate-html.sh | 15 +++++++--------
 3 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100755 .travis/fix-git.sh

diff --git a/.travis.yml b/.travis.yml
index 977b1e8..1369eaf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ env:
 
 before_install:
   - ./.travis/save-key.sh
+  - ./.travis/fix-git.sh
 
 script:
   - ./.travis/generate-html.sh
diff --git a/.travis/fix-git.sh b/.travis/fix-git.sh
new file mode 100755
index 0000000..79d5b6a
--- /dev/null
+++ b/.travis/fix-git.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+git fetch --unshallow
+git fetch --tags
diff --git a/.travis/generate-html.sh b/.travis/generate-html.sh
index 8dd9f3f..1aff23f 100755
--- a/.travis/generate-html.sh
+++ b/.travis/generate-html.sh
@@ -8,14 +8,11 @@ SRCDIR=$PWD
 TMPDIR=$(mktemp -d)
 
 echo
-echo "Project X-Ray Database Revision"
-echo "--------------------------------------------"
-git describe
+echo "Project X-Ray Database Revision $(git describe --long --tags --always)"
 echo "--------------------------------------------"
 git log -1
 echo "--------------------------------------------"
-find -type f | sort
-echo "--------------------------------------------"
+echo
 
 # Remove any pre-existing html output.
 for d in html/*; do
@@ -34,15 +31,15 @@ fi
 
 (
 	cd $TMPDIR/prjxray
+	git fetch --tags
 	echo
-	echo "Project X-Ray Revision"
-	echo "--------------------------------------------"
-	git describe
+	echo "Project X-Ray Revision $(git describe --long --tags --always)"
 	echo "--------------------------------------------"
 	git log -1
 	echo "--------------------------------------------"
 	sha256sum htmlgen/htmlgen.py
 	echo "--------------------------------------------"
+	echo
 )
 
 for SETTINGS in $(find -name settings.sh); do
@@ -56,6 +53,7 @@ for SETTINGS in $(find -name settings.sh); do
 	echo "--------------------------------------------"
 	python3 $TMPDIR/prjxray/htmlgen/htmlgen.py --settings=$SETTINGS
 	echo "--------------------------------------------"
+	echo
 done
 
 (
@@ -65,4 +63,5 @@ done
 	cd html
 	sha256sum $(find -type f html | sort)
 	echo "--------------------------------------------"
+	echo
 )