From 2f6e11ea09949f9540ffdcfd136ec8e88604ee17 Mon Sep 17 00:00:00 2001 From: Geoff Hickey Date: Fri, 23 Feb 2018 18:03:58 -0500 Subject: [PATCH 1/3] Remove the c-for-go workaround I added earlier - fixed upstream. --- scripts/gen-consts.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/gen-consts.sh b/scripts/gen-consts.sh index 758b76c..a53f8ec 100755 --- a/scripts/gen-consts.sh +++ b/scripts/gen-consts.sh @@ -15,12 +15,6 @@ if ! which c-for-go > /dev/null; then echo "failed to install c-for-go. Please install it manually from https://github.com/xlab/c-for-go" exit 1 fi - # HEAD is broken for us because of a failed attempt to redefine the - # __GNUC_PREREQ macro. Checkout an older version to avoid this. - pushd $GOPATH/src/github.com/xlab/c-for-go - git checkout a831fa1954c29f84f7bccab225c3c620d0e7f132 - go install ./... - popd fi # Make sure goyacc is installed (needed for the lvgen/ generator) From 08274ece93398615a9132fdcc6a387dd8b9451b5 Mon Sep 17 00:00:00 2001 From: Geoff Hickey Date: Fri, 23 Feb 2018 18:09:47 -0500 Subject: [PATCH 2/3] Bump go version to 1.10 for travis. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bf1d346..51b25ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ dist: trusty sudo: require go: - - 1.9 + - 1.10 env: - LIBVIRT=1.2.12 EXT=gz From 595827cea1f9a87601dae794b486456d941e0ae7 Mon Sep 17 00:00:00 2001 From: Geoff Hickey Date: Fri, 23 Feb 2018 18:21:08 -0500 Subject: [PATCH 3/3] Go version needs to be a string, not a number. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 51b25ff..882c7a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ dist: trusty sudo: require go: - - 1.10 + - "1.10" env: - LIBVIRT=1.2.12 EXT=gz