diff --git a/hack/release_notes.sh b/hack/release_notes.sh index a0cdc0f601..9e85e8499f 100755 --- a/hack/release_notes.sh +++ b/hack/release_notes.sh @@ -28,21 +28,10 @@ function cleanup_token() { } trap cleanup_token EXIT -install_release_notes_helper() { - release_notes_workdir="$(mktemp -d)" - trap 'rm -rf -- ${release_notes_workdir}' RETURN - - # See https://stackoverflow.com/questions/56842385/using-go-get-to-download-binaries-without-adding-them-to-go-mod for this workaround - cd "${release_notes_workdir}" - go mod init release-notes - GOBIN="$DIR" go get github.com/corneliusweig/release-notes - GOBIN="$DIR" go get github.com/google/pullsheet - cd - -} - if ! [[ -x "${DIR}/release-notes" ]] || ! [[ -x "${DIR}/pullsheet" ]]; then echo >&2 'Installing release-notes' - install_release_notes_helper + go install github.com/corneliusweig/release-notes@latest + go install github.com/google/pullsheet@latest fi git pull https://github.com/kubernetes/minikube.git master --tags diff --git a/hack/update_contributions.sh b/hack/update_contributions.sh index b8a59d3e15..9d0118643f 100755 --- a/hack/update_contributions.sh +++ b/hack/update_contributions.sh @@ -18,20 +18,9 @@ set -eu -o pipefail DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -install_pullsheet() { - pullsheet_workdir="$(mktemp -d)" - trap 'rm -rf -- ${pullsheet_workdir}' RETURN - - # See https://stackoverflow.com/questions/56842385/using-go-get-to-download-binaries-without-adding-them-to-go-mod for this workaround - cd "${pullsheet_workdir}" - go mod init ps - GOBIN="$DIR" go get github.com/google/pullsheet - cd - -} - if ! [[ -x "${DIR}/pullsheet" ]]; then echo >&2 'Installing pullsheet' - install_pullsheet + go install github.com/google/pullsheet@latest fi git fetch --tags -f