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

[3.4] fix release.sh: git_assert_branch_in_sync not exist in 3.4 #15715

Merged
merged 1 commit into from
Apr 14, 2023
Merged

[3.4] fix release.sh: git_assert_branch_in_sync not exist in 3.4 #15715

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/build-binary.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that also applies on other branches. Not as important for this PR.

I prefer git@github.com:etcd-io/etcd.git as during push I can depend on SSH security instead of typing in credentials. It's much safer. Best would be to take address of origin remote from original repo.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree. But in 3.4, actually I never depend on the automatically git push. Instead, each time, I manually bump the version and create/push the tag.

Let's just keep it as it was. It was working well previous. After the 49d05f8, it broke the 3.4 release, so I tend to partially revert the change.

We can consider to enhance it later; but I don't expect to make much big change on 3.4.


if [ -z "$1" ]; then
echo "Usage: ${0} VERSION" >> /dev/stderr
Expand Down
2 changes: 0 additions & 2 deletions scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down