From 272be109140d9dda7697337de900e3afd8d90754 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 27 Nov 2018 23:29:30 -0800 Subject: [PATCH 1/3] Fetch back to 4.0.0-alpha.2 so Travis has the latest tags --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4c7c90b736..fcf5ca433f 100755 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: c compiler: - gcc git: - depth: 6 + depth: 1 # Each item under 'env' is a separate Travis job to execute. # They run in separate environments, so each one must take the time @@ -44,6 +44,9 @@ notifications: on_error: always before_script: + # Expand the git tree back to alpha 2 so we get intermediate tags + - git fetch --shallow-exclude=4.0.0-alpha.2 + - git describe --dirty --always --tags - function var_search () { case "$1" in *$2*) true;; *) false;; esac; } - sudo dpkg --add-architecture i386 From f4e7d7fbb4ded93b7c2b9542d41ef160b9154d53 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 27 Nov 2018 23:59:02 -0800 Subject: [PATCH 2/3] Try to get the last tag. --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fcf5ca433f..09dab9ef34 100755 --- a/.travis.yml +++ b/.travis.yml @@ -44,8 +44,10 @@ notifications: on_error: always before_script: - # Expand the git tree back to alpha 2 so we get intermediate tags - - git fetch --shallow-exclude=4.0.0-alpha.2 + # Expand the git tree back to the last tag. + - LAST_TAG=`git ls-remote --quiet --tags --sort=version:refname | egrep -o "refs/tags/[0-9]+.*\$" | tail -n 1` + - git fetch --shallow-exclude=$LAST_TAG + - git fetch --depth 1 $LAST_TAG - git describe --dirty --always --tags - function var_search () { case "$1" in *$2*) true;; *) false;; esac; } - sudo dpkg --add-architecture i386 From f13fac0fb4e0aea431c072c60936f27f05c723b1 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 28 Nov 2018 00:19:17 -0800 Subject: [PATCH 3/3] try 3 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09dab9ef34..396e194b7f 100755 --- a/.travis.yml +++ b/.travis.yml @@ -44,10 +44,10 @@ notifications: on_error: always before_script: - # Expand the git tree back to the last tag. + # Expand the git tree back to 4.0.0-alpha.1 and then fetch the latest tag. - LAST_TAG=`git ls-remote --quiet --tags --sort=version:refname | egrep -o "refs/tags/[0-9]+.*\$" | tail -n 1` - - git fetch --shallow-exclude=$LAST_TAG - - git fetch --depth 1 $LAST_TAG + - git fetch --shallow-exclude=4.0.0-alpha.1 + - git fetch --depth 1 origin $LAST_TAG:$LAST_TAG - git describe --dirty --always --tags - function var_search () { case "$1" in *$2*) true;; *) false;; esac; } - sudo dpkg --add-architecture i386