File tree Expand file tree Collapse file tree 2 files changed +6
-21
lines changed
developers/scripts/release Expand file tree Collapse file tree 2 files changed +6
-21
lines changed Original file line number Diff line number Diff line change @@ -281,14 +281,7 @@ git checkout main
281281git pull origin main
282282
283283# Create and push annotated tag
284- make release-create-tag TAG =v1.5.0 MESSAGE = " Release v1.5.0
285-
286- ## Highlights
287- - Feature 1: Description
288- - Feature 2: Description
289- - Bug fix: Description
290-
291- See CHANGELOG.md for complete details."
284+ make release-create-tag TAG =v1.5.0 MESSAGE = " Release v1.5.0. See CHANGELOG.md for complete details."
292285```
293286
294287<!-- prettier-ignore-start -->
@@ -401,17 +394,6 @@ make release-merge-back
401394
402395This target includes safety confirmations since it pushes directly to develop.
403396
404- ### Tag Docker Images as Latest (for major releases)
405-
406- For major releases, you may want to tag as ` latest ` :
407-
408- ``` bash
409- # This would typically be done via additional CI job or manually
410- docker pull o1labs/mina-rust:v2.0.0
411- docker tag o1labs/mina-rust:v2.0.0 o1labs/mina-rust:latest
412- docker push o1labs/mina-rust:latest
413- ```
414-
415397## Hotfix Process
416398
417399For urgent patches to released versions:
Original file line number Diff line number Diff line change @@ -12,9 +12,12 @@ if [ "$confirm" != "y" ] && [ "$confirm" != "Y" ]; then
1212fi
1313
1414echo " Merging main back to develop..."
15+ BRANCH_NAME=tmp-merge-branch-" $( date +%s) "
1516git checkout develop
1617git pull origin develop
18+ git checkout -b " ${BRANCH_NAME} "
1719git merge main --no-edit
18- git push origin develop
20+ git push origin " ${BRANCH_NAME} "
21+ gh pr create --title " Merge main back to develop" --body " Automated merge of main into develop." --base develop --head " ${BRANCH_NAME} "
1922
20- echo " Successfully merged main back to develop"
23+ echo " Successfully merged main back to develop"
You can’t perform that action at this time.
0 commit comments