diff --git a/script/bump-zed-minor-versions b/script/bump-zed-minor-versions index bec3a58887..589f79f29b 100755 --- a/script/bump-zed-minor-versions +++ b/script/bump-zed-minor-versions @@ -28,6 +28,7 @@ minor_branch_name="v${major}.${minor}.x" prev_minor_branch_name="v${major}.${prev_minor}.x" next_minor_branch_name="v${major}.${next_minor}.x" preview_tag_name="v${major}.${minor}.${patch}-pre" +bump_main_branch_name="set-minor-version-to-${major}.${next_minor}" git fetch origin ${prev_minor_branch_name}:${prev_minor_branch_name} git fetch origin --tags @@ -83,29 +84,39 @@ git tag ${preview_tag_name} echo "Preparing main for version ${next_minor_branch_name}..." git checkout -q main git clean -q -dff -old_main_sha=$(git rev-parse HEAD) +git checkout -q -b ${bump_main_branch_name} cargo set-version --package zed --bump minor cargo check -q -git commit -q --all --message "${next_minor_branch_name} dev" +message="${next_minor_branch_name} dev + +Release Notes: + +- N/A" +git commit -q --all --message "$message" + +git checkout -q main cat <