diff --git a/Makefile b/Makefile index 9b2ed2d..0193746 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ test: done go_mod_tidy: - go get -u && go mod tidy -compat=1.18 + go get -u && go mod tidy set -e; for dir in $(ALL_GO_MOD_DIRS); do \ echo "go mod tidy in $${dir}"; \ (cd "$${dir}" && \ diff --git a/scripts/release.sh b/scripts/release.sh index ef1f7fa..cee6eee 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -47,8 +47,8 @@ PACKAGE_DIRS=$(find . -mindepth 2 -type f -name 'go.mod' -exec dirname {} \; \ for dir in $PACKAGE_DIRS do - printf "${dir}: go mod tidy -compat=1.18\n" - (cd ./${dir} && go mod tidy -compat=1.18) + printf "${dir}: go mod tidy\n" + (cd ./${dir} && go mod tidy) done @@ -56,7 +56,7 @@ for dir in $PACKAGE_DIRS do sed --in-place \ "s/uptrace\/bunrouter\([^ ]*\) v.*/uptrace\/bunrouter\1 ${TAG}/" "${dir}/go.mod" - (cd ./${dir} && go mod tidy -compat=1.18) + (cd ./${dir} && go mod tidy) done sed --in-place "s/\(return \)\"[^\"]*\"/\1\"${TAG#v}\"/" ./version.go