mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12981 from ptabor/20210516-fix-release-script

Browse Source 
Fix release script: add `go mod tidy` after go.mod changes
This commit is contained in:
Piotr Tabor 2021-05-17 11:35:21 +02:00 committed by GitHub
commit 1675101293
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/release
View File

@ -42,6 +42,8 @@ help() {
echo " --no-upload: skip gs://etcd binary artifact uploads." echo " --no-upload: skip gs://etcd binary artifact uploads."
echo " --no-docker-push: skip docker image pushes." echo " --no-docker-push: skip docker image pushes."
echo "" 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() { main() {

9
scripts/release_mod.sh
View File

@ -30,6 +30,7 @@ function update_module_version() {
local v3version="${1}" local v3version="${1}"
local v2version="${2}" local v2version="${2}"
local modules local modules
run go mod tidy
modules=$(run go list -f '{{if not .Main}}{{if not .Indirect}}{{.Path}}{{end}}{{end}}' -m all) modules=$(run go list -f '{{if not .Main}}{{if not .Indirect}}{{.Path}}{{end}}{{end}}' -m all)
v3deps=$(echo "${modules}" | grep -E "${ROOT_MODULE}/.*/v3") v3deps=$(echo "${modules}" | grep -E "${ROOT_MODULE}/.*/v3")
@ -41,6 +42,13 @@ function update_module_version() {
for dep in ${v2deps}; do for dep in ${v2deps}; do
run go mod edit -require "${dep}@${v2version}" run go mod edit -require "${dep}@${v2version}"
done 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. # Updates all cross-module versions to ${TARGET_VERSION} in local client.
@ -65,6 +73,7 @@ function update_versions_cmd() {
log_info "v2version: ${v2version}" log_info "v2version: ${v2version}"
run_for_modules update_module_version "${v3version}" "${v2version}" run_for_modules update_module_version "${v3version}" "${v2version}"
run_for_modules mod_tidy_fix || exit 2
} }
function get_gpg_key { function get_gpg_key {