From 4e3353109de78df588a7cbb1c278dadb7e374e82 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Nov 2019 13:17:52 +0100 Subject: [PATCH] Reset changes by 'go get' --- run_integration_tests.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/run_integration_tests.go b/run_integration_tests.go index 64e247af2..2c68b93fd 100644 --- a/run_integration_tests.go +++ b/run_integration_tests.go @@ -201,6 +201,11 @@ func (env *TravisEnvironment) Prepare() error { } } + // reset changes made to go.mod/go.sum by "go get" + if err := run("git", "checkout", "go.mod", "go.sum"); err != nil { + return err + } + if err := env.getMinio(); err != nil { return err } @@ -210,6 +215,12 @@ func (env *TravisEnvironment) Prepare() error { if err := run("go", "get", "github.com/mitchellh/gox"); err != nil { return err } + + // reset changes made to go.mod/go.sum by "go get" + if err := run("git", "checkout", "go.mod", "go.sum"); err != nil { + return err + } + if runtime.GOOS == "linux" { env.goxOSArch = []string{ "linux/386", "linux/amd64",