Merge pull request #15715 from ahrtr/fix_release_20230414

[3.4] fix release.sh: git_assert_branch_in_sync not exist in 3.4
etcd-io · Apr 14, 2023 · 94593e6 · 94593e6
2 parents bc19b67 + 46c6ea5
commit 94593e6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/scripts/build-binary.sh b/scripts/build-binary.sh
@@ -6,7 +6,7 @@ source ./scripts/test_lib.sh
 
 VER=$1
 PROJ="etcd"
-REPOSITORY="${REPOSITORY:-git@github.com:etcd-io/etcd.git}"
+REPOSITORY="${REPOSITORY:-https://github.com/etcd-io/etcd.git}"
 
 if [ -z "$1" ]; then
 	echo "Usage: ${0} VERSION" >> /dev/stderr

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -69,8 +69,6 @@ main() {
     cd "${reldir}/etcd" || exit 2
     git checkout "${BRANCH}" || exit 2
     git pull origin
-
-    git_assert_branch_in_sync || exit 2
   fi
 
   # If a release version tag already exists, use it.