Fix Travis

It looks like that whole "Fixing Travis's git clone" code was just
there to make the "git describe --tags" work. I simply removed both.

Signed-off-by: Clifford Wolf <clifford@clifford.at>

diff --git a/.travis/build-and-test.sh b/.travis/build-and-test.sh
index 096dde64f82eee6c2e9d71cb6758ae0dab15d68e..b8c35041d54b14f485913efa310287b039ee0be9 100755 (executable)
--- a/.travis/build-and-test.sh
+++ b/.travis/build-and-test.sh
@@ -36,6 +36,8 @@ echo
 
 ##########################################################################
 
+./yosys tests/simple/fiedler-cooley.v
+
 echo
 echo 'Testing...' && echo -en 'travis_fold:start:script.test\\r'
 echo

diff --git a/.travis/setup.sh b/.travis/setup.sh
index d689cd2bdf0561ea9892f3710775d6b54c5adf7d..4af0b8ee993feca32e0725f8bec5c2cb39438300 100755 (executable)
--- a/.travis/setup.sh
+++ b/.travis/setup.sh
@@ -6,48 +6,15 @@ source .travis/common.sh
 
 ##########################################################################
 
-# Fixing Travis's git clone
-echo
-echo 'Fixing git setup...' && echo -en 'travis_fold:start:before_install.git\\r'
-echo
-git fetch --unshallow && git fetch --tags
-
-# For pull requests, we get more info about the git source.
-if [ z"$TRAVIS_PULL_REQUEST_SLUG" != z ]; then
-       echo "- Fetching from pull request source"
-       git remote add source https://github.com/$TRAVIS_PULL_REQUEST_SLUG.git
-       git fetch source && git fetch --tags
-
-       echo "- Fetching the actual pull request"
-       git fetch origin pull/$TRAVIS_PULL_REQUEST/head:pull-$TRAVIS_PULL_REQUEST-head
-       git fetch origin pull/$TRAVIS_PULL_REQUEST/merge:pull-$TRAVIS_PULL_REQUEST-merge
-
-       git log -n 5 --graph pull-$TRAVIS_PULL_REQUEST-merge
-fi
-
-# For building branches we need to fix the "detached head" state.
-if [ z"$TRAVIS_BRANCH" != z ]; then
-       TRAVIS_COMMIT_ACTUAL=$(git log --pretty=format:'%H' -n 1)
-       echo "- Fixing detached head (current $TRAVIS_COMMIT_ACTUAL -> $TRAVIS_COMMIT)"
-       git remote -v
-       git branch -v
-       if [ x"$(git show-ref -s HEAD)" = x"$TRAVIS_COMMIT" ]; then
-               echo "Checked out at $TRAVIS_COMMIT"
-       else
-               if [ z"$TRAVIS_PULL_REQUEST_SLUG" != z ]; then
-                       git fetch source $TRAVIS_COMMIT || echo "Unable to fetch $TRAVIS_COMMIT from source"
-               fi
-               git fetch origin $TRAVIS_COMMIT || echo "Unable to fetch $TRAVIS_COMMIT from origin"
-       fi
-       git branch -D $TRAVIS_BRANCH || true
-       git checkout $TRAVIS_COMMIT -b $TRAVIS_BRANCH
-       git branch -v
-fi
-
 # Output status information.
-git status
-git describe --tags
-git log -n 5 --graph
+(
+       set +e
+       set -x
+       git status
+       git branch -v
+       git log -n 5 --graph
+       git log --format=oneline -n 20 --graph
+)
 echo
 echo -en 'travis_fold:end:before_install.git\\r'
 echo

diff --git a/Makefile b/Makefile
index d83a712562f32b269d3e77f296032e143560c10a..8e93cd285dfacdafa394e9ddfdb00b583de2e833 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ LDFLAGS += -rdynamic
 LDLIBS += -lrt
 endif
 
-YOSYS_VER := 0.8+$(shell cd $(YOSYS_SRC) && test -e .git && { git log --author=clifford@clifford.at --oneline 4d4665b.. | wc -l; })
+YOSYS_VER := 0.8+$(shell cd $(YOSYS_SRC) && test -e .git && { git log --author=clifford@clifford.at --oneline 4d4665b.. 2> /dev/null | wc -l; })
 GIT_REV := $(shell cd $(YOSYS_SRC) && git rev-parse --short HEAD 2> /dev/null || echo UNKNOWN)
 OBJS = kernel/version_$(GIT_REV).o