Bump Go to latest 1.14

datadope-io · Nov 16, 2020 · 5739842 · 5739842
1 parent ce6c886
commit 5739842
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 48 deletions.
diff --git a/.mk/check.mk b/.mk/check.mk
@@ -15,14 +15,7 @@ fmt: genlocalfiles
 .PHONY: vet
 vet:
 	@echo "+ $@"
-	test -z "$$($(GO) tool vet $$( \
-			$(GO) list ./... \
-			| perl -pe 's|$(SKYDIVE_GITHUB)/?||g' \
-			| grep -v '^tests') 2>&1 \
-		| tee /dev/stderr \
-		| grep -v '^flow/probes/afpacket/' \
-		| grep -v 'exit status 1' \
-		)"
+	go vet ./...
 
 .PHONY: check
 check: lint

diff --git a/.mk/dist.mk b/.mk/dist.mk
@@ -22,9 +22,7 @@ endef
 
 .PHONY: vendor
 vendor: genlocalfiles
-ifeq (${GO111MODULE}, on)
 	go mod vendor
-endif
 
 .PHONY: localdist
 localdist: vendor

diff --git a/Makefile b/Makefile
@@ -1,5 +1,3 @@
-export GO111MODULE?=on
-
 define VERSION_CMD =
 eval ' \
 	define=""; \
@@ -153,9 +151,7 @@ skydive.clean:
 
 .PHONY: moddownload
 moddownload:
-ifeq (${GO111MODULE}, on)
 	go mod download
-endif
 
 .PHONY: genlocalfiles
 genlocalfiles: $(EXTRA_BUILD_TARGET) .proto .bindata .gendecoder .easyjson .vppbinapi

diff --git a/contrib/ansible/roles/skydive_dev/tasks/gimme.yml b/contrib/ansible/roles/skydive_dev/tasks/gimme.yml
@@ -9,7 +9,7 @@
 - name: run gimme in bash profile
   lineinfile:
     path: /home/vagrant/.bash_profile
-    line: 'eval "$(gimme 1.11.13)"'
+    line: 'eval "$(gimme 1.14.x)"'
 
 - name: set GOPATH
   lineinfile:
@@ -22,6 +22,6 @@
     line: 'export PATH=/home/vagrant/go/bin:$PATH'
 
 - name: run gimme once
-  command: /usr/local/bin/gimme 1.11.13
+  command: /usr/local/bin/gimme 1.14.x
   become: yes
   become_user: vagrant
diff --git a/contrib/packaging/rpm/specfile-update-bundles b/contrib/packaging/rpm/specfile-update-bundles
@@ -14,7 +14,7 @@ if len(sys.argv) != 3:
     sys.exit(0)
 
 provides = []
-mod = json.loads(commands.getoutput("GO111MODULE=on go mod edit -json " + sys.argv[1]))
+mod = json.loads(commands.getoutput("go mod edit -json " + sys.argv[1]))
 for package in mod["Require"]:
     provides.append("Provides: bundled(golang(%s)) = %s" % (package["Path"], package["Version"].split("-")[-1].split("+")[0]))
 

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
@@ -15,8 +15,8 @@
 # The path where go binaries have to be installed
 GOROOT=${GOROOT:-/opt/go}
 
-# golang version. Skydive needs at least version 1.11
-GO_VERSION=${GO_VERSION:-1.11.13}
+# golang version. Skydive needs at least version 1.14
+GO_VERSION=${GO_VERSION:-1.14.x}
 
 # GOPATH where the go src, pkgs are installed
 GOPATH=/opt/stack/go
@@ -100,7 +100,6 @@ function install_go {
     export GOROOT=$GOROOT
     export PATH=$PATH:$GOROOT/bin:$GOPATH/bin
     export GOPATH=$GOPATH
-    export GO111MODULE=on
 }
 
 function download_elasticsearch {

diff --git a/go.mod b/go.mod
@@ -150,4 +150,4 @@ replace (
 	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191016112829-06bb3c9d77c9
 )
 
-go 1.11
+go 1.14
diff --git a/scripts/ci/devstack/run-openstack-tests.sh b/scripts/ci/devstack/run-openstack-tests.sh
@@ -8,6 +8,6 @@ export OS_AUTH_URL=${OS_AUTH_URL}/v${OS_IDENTITY_API_VERSION}
 export PATH=$PATH:/opt/go/bin:/opt/stack/go/bin:/opt/stack/protoc/bin
 export GOROOT=/opt/go
 export GOPATH=/opt/stack/go
-export GO_VERSION=1.11
+export GO_VERSION=1.14
 cd /opt/stack/go/src/github.com/skydive-project/skydive/
 SKYDIVE_ANALYZERS=localhost:8082 make test.functionals WITH_NEUTRON=true VERBOSE=true TIMEOUT=5m TEST_PATTERN=Neutron
diff --git a/scripts/ci/install-go.sh b/scripts/ci/install-go.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,4 +150,4 @@ replace ( @@
     	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191016112829-06bb3c9d77c9
     )
-    go 1.11
+    go 1.14