Skip to content
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

Jump to bottom

Fix release script: add go mod tidy after go.mod changes #12981

Merged
merged 1 commit into from
May 17, 2021
+11 −0
Merged

Fix release script: add go mod tidy after go.mod changes #12981

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 scripts/release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ help() {
echo " --no-upload: skip gs://etcd binary artifact uploads."
echo " --no-docker-push: skip docker image pushes."
echo ""
echo "One can perform a (dry-run) test release from any (uncommitted) branch using:"
echo " DRY_RUN=true REPOSITORY=\`pwd\` BRANCH='local-branch-name' ./scripts/release 3.5.0-foobar.2"
}

main() {
Expand Down
9 changes: 9 additions & 0 deletions scripts/release_mod.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ function update_module_version() {
local v3version="${1}"
local v2version="${2}"
local modules
run go mod tidy
modules=$(run go list -f '{{if not .Main}}{{if not .Indirect}}{{.Path}}{{end}}{{end}}' -m all)

v3deps=$(echo "${modules}" | grep -E "${ROOT_MODULE}/.*/v3")
Expand All @@ -41,6 +42,13 @@ function update_module_version() {
for dep in ${v2deps}; do
run go mod edit -require "${dep}@${v2version}"
done

run go mod tidy
}

function mod_tidy_fix {
run rm ./go.sum
run go mod tidy || return 2
}

# Updates all cross-module versions to ${TARGET_VERSION} in local client.
Expand All @@ -65,6 +73,7 @@ function update_versions_cmd() {
log_info "v2version: ${v2version}"

run_for_modules update_module_version "${v3version}" "${v2version}"
run_for_modules mod_tidy_fix || exit 2
}

function get_gpg_key {
Expand Down