Skip to content

Commit 34695f4

Browse files
lafriksjonasfranz
authored andcommitted
Update process to include tag vX.Y.0-dev on master branch (#5091)
1 parent 4090204 commit 34695f4

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

CONTRIBUTING.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,13 @@ be reviewed by two maintainers and must pass the automatic tests.
261261

262262
* Let $vmaj, $vmin and $vpat be Major, Minor and Patch version numbers, $vpat should be rc1, rc2, 0, 1, ...... $vmaj.$vmin will be kept the same as milestones on github or gitea in future.
263263
* Before releasing, confirm all the version's milestone issues or PRs has been resolved. Then discuss the release on discord channel #maintainers and get agreed with almost all the owners and mergers. Or you can declare the version and if nobody against in about serval hours.
264-
* If this is a big version, then you have to create a new branch named `release/v$vmaj.$vmin`
265-
* Create PR for changelog on branch `release/v$vmaj.$vmin`
266-
* After your PR reviewed and merged, and CI passed, add a tag as `git tag -s -F release.notes v$vmaj.$vmin.$`, release.notes file could be a temporary file to only include the changelog this version which you added to `CHANGELOG.md`.
264+
* If this is a big version first you have to create PR for changelog on branch `master` with PRs with label `changelog` and after it has been merged do following steps:
265+
* Create `-dev` tag as `git tag -s -F release.notes v$vmaj.$vmin.0-dev` and push the tag as `git push origin v$vmaj.$vmin.0-dev`.
266+
* When CI has finished building tag then you have to create a new branch named `release/v$vmaj.$vmin`
267+
* If it is bugfix version create PR for changelog on branch `release/v$vmaj.$vmin` and wait till it is reviewed and merged.
268+
* Add a tag as `git tag -s -F release.notes v$vmaj.$vmin.$`, release.notes file could be a temporary file to only include the changelog this version which you added to `CHANGELOG.md`.
267269
* And then push the tag as `git push origin v$vmaj.$vmin.$`. Drone CI will automatically created a release and upload all the compiled binary. (But currently it didn't add the release notes automatically. Maybe we should fix that.)
268-
* Send PR for changelog on branch `master`.
270+
* If needed send PR for changelog on branch `master`.
269271
* Send PR to [blog repository](https://github.com/go-gitea/blog) announcing the release.
270272

271273
## Copyright

0 commit comments

Comments
 (0)