drop mod=vendor usage as that's the default with go1.14

rhuss · Jun 5, 2020 · 567004d · 567004d
1 parent 9616d5e
commit 567004d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/hack/build.sh b/hack/build.sh
@@ -130,7 +130,7 @@ source_format() {
 
 go_build() {
   echo "🚧 Compile"
-  go build -mod=vendor -ldflags "$(build_flags $(basedir))" -o kn ./cmd/...
+  go build -ldflags "$(build_flags $(basedir))" -o kn ./cmd/...
 }
 
 go_test() {
@@ -273,11 +273,11 @@ cross_build() {
 
   export CGO_ENABLED=0
   echo "   🐧 kn-linux-amd64"
-  GOOS=linux GOARCH=amd64 go build -mod=vendor -ldflags "${ld_flags}" -o ./kn-linux-amd64 ./cmd/... || failed=1
+  GOOS=linux GOARCH=amd64 go build -ldflags "${ld_flags}" -o ./kn-linux-amd64 ./cmd/... || failed=1
   echo "   🍏 kn-darwin-amd64"
-  GOOS=darwin GOARCH=amd64 go build -mod=vendor -ldflags "${ld_flags}" -o ./kn-darwin-amd64 ./cmd/... || failed=1
+  GOOS=darwin GOARCH=amd64 go build -ldflags "${ld_flags}" -o ./kn-darwin-amd64 ./cmd/... || failed=1
   echo "   🎠 kn-windows-amd64.exe"
-  GOOS=windows GOARCH=amd64 go build -mod=vendor -ldflags "${ld_flags}" -o ./kn-windows-amd64.exe ./cmd/... || failed=1
+  GOOS=windows GOARCH=amd64 go build -ldflags "${ld_flags}" -o ./kn-windows-amd64.exe ./cmd/... || failed=1
 
   return ${failed}
 }

diff --git a/hack/release.sh b/hack/release.sh
@@ -30,11 +30,11 @@ function build_release() {
   export GO111MODULE=on
   export CGO_ENABLED=0
   echo "🚧 🐧 Building for Linux"
-  GOOS=linux GOARCH=amd64 go build -mod=vendor -ldflags "${ld_flags}" -o ./kn-linux-amd64 ./cmd/...
+  GOOS=linux GOARCH=amd64 go build -ldflags "${ld_flags}" -o ./kn-linux-amd64 ./cmd/...
   echo "🚧 🍏 Building for macOS"
-  GOOS=darwin GOARCH=amd64 go build -mod=vendor -ldflags "${ld_flags}" -o ./kn-darwin-amd64 ./cmd/...
+  GOOS=darwin GOARCH=amd64 go build -ldflags "${ld_flags}" -o ./kn-darwin-amd64 ./cmd/...
   echo "🚧 🎠 Building for Windows"
-  GOOS=windows GOARCH=amd64 go build -mod=vendor -ldflags "${ld_flags}" -o ./kn-windows-amd64.exe ./cmd/...
+  GOOS=windows GOARCH=amd64 go build -ldflags "${ld_flags}" -o ./kn-windows-amd64.exe ./cmd/...
   echo "🚧 🐳 Building the container image"
   ko resolve --strict ${KO_FLAGS} -f config/ > kn-image-location.yaml
   ARTIFACTS_TO_PUBLISH="kn-darwin-amd64 kn-linux-amd64 kn-windows-amd64.exe kn-image-location.yaml"

diff --git a/hack/update-deps.sh b/hack/update-deps.sh
@@ -58,7 +58,6 @@ go mod vendor
 # Cleanup
 find "${ROOT_DIR}/vendor" \( -name "OWNERS" -o -name "*_test.go" \) -print0 | xargs -0 rm -f
 
-export GOFLAGS=-mod=vendor
 update_licenses "${ROOT_DIR}/third_party/VENDOR-LICENSE" "./..."
 
 remove_broken_symlinks "${ROOT_DIR}/vendor"
diff --git a/test/local-e2e-tests.sh b/test/local-e2e-tests.sh
@@ -24,4 +24,4 @@ base=$(cd "$dir/.." && pwd)
 export KN_E2E_NAMESPACE=kne2etests
 
 echo "🧪  Testing"
-go test -mod=vendor ${base}/test/e2e/ -test.v -tags "e2e ${E2E_TAGS}" "$@"
+go test ${base}/test/e2e/ -test.v -tags "e2e ${E2E_TAGS}" "$@"
diff --git a/test/presubmit-tests.sh b/test/presubmit-tests.sh
@@ -53,7 +53,7 @@ function post_build_tests() {
 # Run the unit tests with an additional flag '-mod=vendor' to avoid
 # downloading the deps in unit tests CI job
 function unit_tests() {
-  report_go_test -race -mod=vendor ./... || failed=1
+  report_go_test -race ./... || failed=1
 }
 
 # We use the default build and integration test runners.