Skip to content

update Makefile to set GO11MODULE=off and generate test/extended #24869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sallyom wants to merge 1 commit into from
Closed

update Makefile to set GO11MODULE=off and generate test/extended #24869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions hack/build-go.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ if [[ -z "$@" ]]; then
vendor/k8s.io/kubernetes/cmd/kubelet)
fi

os::golang::ensure_gomod_off

OS_BUILD_PLATFORMS=("${OS_BUILD_PLATFORMS[@]:-${platform}}")
os::build::build_binaries "${build_targets[@]}"
os::build::place_bins "${build_targets[@]}"
Expand Down
6 changes: 6 additions & 0 deletions hack/lib/util/golang.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,9 @@ function os::golang::verify_glide_version() {

}
readonly -f os::golang::verify_glide_version

# os::golang::ensure_gomod_off ensures gomod is off
function os::golang::ensure_gomod_off() {
export GO111MODULE=off
}
readonly -f os::golang::ensure_gomod_off
2 changes: 2 additions & 0 deletions hack/update-generated-bindata.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
STARTTIME=$(date +%s)
source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

os::golang::ensure_gomod_off

go generate ./test/extended

os::build::setup_env
Expand Down