From 1d61cbbd8743bdae358abf5b43c4a2456e13fc4c Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Mon, 18 Dec 2017 06:48:46 +0100
Subject: travis: tentatively fix release identifier in macos builds.

For #496
---
 dist/linux/travis-ci.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'dist/linux')

diff --git a/dist/linux/travis-ci.sh b/dist/linux/travis-ci.sh
index b8db1ddc7..5d328279a 100755
--- a/dist/linux/travis-ci.sh
+++ b/dist/linux/travis-ci.sh
@@ -44,16 +44,12 @@ if [ "$IMAGE" = "" ]; then
 fi
 
 
-echo "travis_fold:start:patch_version"
+echo "travis_fold:start:fetch"
 # The command 'git describe' (used for version) needs the history. Get it.
 # But the following command fails if the repository is complete.
 git fetch --unshallow || true
 
-# Build version.tmp and replace version.in with it (so that the version is
-# correctly set).
-make -f Makefile.in srcdir=. version.tmp
-cp version.tmp src/version.in
-echo "travis_fold:end:patch_version"
+echo "travis_fold:end:fetch"
 
 
 # Compute package name
@@ -99,6 +95,14 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
 else
     # Assume linux
 
+    # Build version.tmp and replace version.in with it (so that the version is
+    # correctly set).
+    # This is a little bit hack-ish, as it assumes that 'git' is not
+    # available in docker (otherwise it will describe as -dirty
+    # because this modifies the source file version.in).
+    make -f Makefile.in srcdir=. version.tmp
+    cp version.tmp src/version.in
+
     # Run build in docker
     IMAGE_TAG=`echo $IMAGE | sed -e 's/+/-/g'`
     docker run --rm -t -v $(pwd):/work -w "/work" ghdl/build:$IMAGE_TAG bash -c "${scriptdir}/build.sh $BUILD_CMD_OPTS"
-- 
cgit v1.2.3