File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -44,16 +44,12 @@ if [ "$IMAGE" = "" ]; then
4444fi
4545
4646
47- echo " travis_fold:start:patch_version "
47+ echo " travis_fold:start:fetch "
4848# The command 'git describe' (used for version) needs the history. Get it.
4949# But the following command fails if the repository is complete.
5050git fetch --unshallow || true
5151
52- # Build version.tmp and replace version.in with it (so that the version is
53- # correctly set).
54- make -f Makefile.in srcdir=. version.tmp
55- cp version.tmp src/version.in
56- echo " travis_fold:end:patch_version"
52+ echo " travis_fold:end:fetch"
5753
5854
5955# Compute package name
@@ -99,6 +95,14 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
9995else
10096 # Assume linux
10197
98+ # Build version.tmp and replace version.in with it (so that the version is
99+ # correctly set).
100+ # This is a little bit hack-ish, as it assumes that 'git' is not
101+ # available in docker (otherwise it will describe as -dirty
102+ # because this modifies the source file version.in).
103+ make -f Makefile.in srcdir=. version.tmp
104+ cp version.tmp src/version.in
105+
102106 # Run build in docker
103107 IMAGE_TAG=` echo $IMAGE | sed -e ' s/+/-/g' `
104108 docker run --rm -t -v $( pwd) :/work -w " /work" ghdl/build:$IMAGE_TAG bash -c " ${scriptdir} /build.sh $BUILD_CMD_OPTS "
You can’t perform that action at this time.
0 commit comments