From 6cc6262c9a06d47cf2e11aad9867140b8f0737be Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Thu, 21 Dec 2017 14:13:49 +0100 Subject: [PATCH] travis: Use Project X-Ray version from the Info file. --- .travis/generate-html.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis/generate-html.sh b/.travis/generate-html.sh index 1aff23f..2145e25 100755 --- a/.travis/generate-html.sh +++ b/.travis/generate-html.sh @@ -7,6 +7,8 @@ export CURRENT_OWNER="$(git remote get-url origin | sed -e's@/[^/]\+$@@' -e's@.* SRCDIR=$PWD TMPDIR=$(mktemp -d) +PRJXRAY_INFO_REVISION=$(grep "prjxray/commit" Info.md | sed -e's-.*/prjxray/commit/--' -e's/\([0-9a-fA-F]*\).*$/\1/') + echo echo "Project X-Ray Database Revision $(git describe --long --tags --always)" echo "--------------------------------------------" @@ -14,6 +16,8 @@ git log -1 echo "--------------------------------------------" echo + + # Remove any pre-existing html output. for d in html/*; do if [ -d "$d" ]; then @@ -32,9 +36,12 @@ fi ( cd $TMPDIR/prjxray git fetch --tags + git reset --hard $PRJXRAY_INFO_REVISION echo echo "Project X-Ray Revision $(git describe --long --tags --always)" echo "--------------------------------------------" + echo "Info says version should be $(git describe --long --tags --always $PRJXRAY_INFO_REVISION) ($PRJXRAY_INFO_REVISION)" + echo "--------------------------------------------" git log -1 echo "--------------------------------------------" sha256sum htmlgen/htmlgen.py