Skip to content

Commit

Permalink
Fix release script: add go mod tidy
Browse files Browse the repository at this point in the history
Seems that additinal refresh of go.sum files is needed during the
release process after editing the versions of modules.

Discovered the problem while I was testing whether etcdutl is
properly included in the target binaries using:

```
DRY_RUN=true REPOSITORY=\`pwd\` BRANCH='branch-with-etcdutl' ./scripts/release 3.5.0-foobar.2
```
  • Loading branch information
ptabor committed May 16, 2021
1 parent 9501e8e commit 2712c78
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions scripts/release
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
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

0 comments on commit 2712c78

Please sign in to comment.