From bedfa99b83178cbdf6a99c7418dd804d74c15e2b Mon Sep 17 00:00:00 2001
From: Chi Zhang <chizhg@google.com>
Date: Tue, 24 Mar 2020 12:56:10 -0700
Subject: [PATCH] update test-infra to pick up the fix (#759)

---
 go.mod                                           |  4 ++--
 go.sum                                           |  8 ++++----
 vendor/knative.dev/test-infra/scripts/library.sh | 13 ++++++++++++-
 vendor/modules.txt                               |  4 ++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/go.mod b/go.mod
index 51e8fb52d..e286a567e 100644
--- a/go.mod
+++ b/go.mod
@@ -21,8 +21,8 @@ require (
 	k8s.io/client-go v0.17.0
 	knative.dev/eventing v0.13.4
 	knative.dev/pkg v0.0.0-20200323231609-0840da9555a3
-	knative.dev/serving v0.13.1-0.20200323211309-d1be5c476fef
-	knative.dev/test-infra v0.0.0-20200324033909-0042e9ca752c
+	knative.dev/serving v0.13.1-0.20200324164309-ce10070bb7ef
+	knative.dev/test-infra v0.0.0-20200324183109-d81c66eea4e6
 	sigs.k8s.io/yaml v1.1.0
 )
 
diff --git a/go.sum b/go.sum
index 3265bdd9b..aec65a35d 100644
--- a/go.sum
+++ b/go.sum
@@ -596,10 +596,10 @@ knative.dev/eventing v0.13.4 h1:UqTsfNza4BX5W0+KDoCjPOa+mkU4idE+HolqG7SdN0w=
 knative.dev/eventing v0.13.4/go.mod h1:UxweNv8yXhsdHJitcb9R6rmfNaUD2DFi9GWwNRyIs58=
 knative.dev/pkg v0.0.0-20200323231609-0840da9555a3 h1:lox+XrjDaw+aJxl5LZ7e+NO9Hj1OWm/ZWyyu8a2rKVI=
 knative.dev/pkg v0.0.0-20200323231609-0840da9555a3/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
-knative.dev/serving v0.13.1-0.20200323211309-d1be5c476fef h1:fvTesC3kLmw5O71er+GQ9SsvR2mh38r3XcdY2fPrqf4=
-knative.dev/serving v0.13.1-0.20200323211309-d1be5c476fef/go.mod h1:x2n255JS2XBI39tmjZ8CwTxIf9EKNMCrkVuiOttLRm0=
-knative.dev/test-infra v0.0.0-20200324033909-0042e9ca752c h1:J2lgcU2CRPCtWGGDBvy02wBE6fqhemIWLuxMAarx2VY=
-knative.dev/test-infra v0.0.0-20200324033909-0042e9ca752c/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
+knative.dev/serving v0.13.1-0.20200324164309-ce10070bb7ef h1:4CWRxXBbhEFS8kw26awitohUBZ5ao4iNWqMUdu/uf98=
+knative.dev/serving v0.13.1-0.20200324164309-ce10070bb7ef/go.mod h1:x2n255JS2XBI39tmjZ8CwTxIf9EKNMCrkVuiOttLRm0=
+knative.dev/test-infra v0.0.0-20200324183109-d81c66eea4e6 h1:cttACHBnpN7b509UJnQV1tCD/ssIIGJhHSdHzpPeMzE=
+knative.dev/test-infra v0.0.0-20200324183109-d81c66eea4e6/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
 modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
diff --git a/vendor/knative.dev/test-infra/scripts/library.sh b/vendor/knative.dev/test-infra/scripts/library.sh
index 3d227571b..6a71ed55d 100644
--- a/vendor/knative.dev/test-infra/scripts/library.sh
+++ b/vendor/knative.dev/test-infra/scripts/library.sh
@@ -482,7 +482,18 @@ function run_go_tool() {
   if [[ -z "$(which ${tool})" ]]; then
     local action=get
     [[ $1 =~ ^[\./].* ]] && action=install
-    go ${action} $1
+    # Avoid running `go get` from root dir of the repository, as it can change go.sum and go.mod files.
+    # See discussions in https://github.com/golang/go/issues/27643.
+    if [[ ${action} == "get" && $(pwd) == "${REPO_ROOT_DIR}" ]]; then
+      local temp_dir="$(mktemp -d)"
+      local install_failed=0
+      pushd "${temp_dir}"
+      go ${action} $1 || install_failed=1
+      popd
+      (( install_failed )) && return ${install_failed}
+    else
+      go ${action} $1
+    fi
   fi
   shift 2
   ${tool} "$@"
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 7ea7ef3aa..a92d56640 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -513,7 +513,7 @@ knative.dev/pkg/logging/logkey
 knative.dev/pkg/profiling
 knative.dev/pkg/ptr
 knative.dev/pkg/tracker
-# knative.dev/serving v0.13.1-0.20200323211309-d1be5c476fef
+# knative.dev/serving v0.13.1-0.20200324164309-ce10070bb7ef
 knative.dev/serving/pkg/apis/autoscaling
 knative.dev/serving/pkg/apis/autoscaling/v1alpha1
 knative.dev/serving/pkg/apis/config
@@ -527,7 +527,7 @@ knative.dev/serving/pkg/autoscaler/config
 knative.dev/serving/pkg/client/clientset/versioned/scheme
 knative.dev/serving/pkg/client/clientset/versioned/typed/serving/v1
 knative.dev/serving/pkg/client/clientset/versioned/typed/serving/v1/fake
-# knative.dev/test-infra v0.0.0-20200324033909-0042e9ca752c
+# knative.dev/test-infra v0.0.0-20200324183109-d81c66eea4e6
 knative.dev/test-infra/scripts
 # sigs.k8s.io/kustomize v2.0.3+incompatible
 sigs.k8s.io/kustomize/pkg/commands/build