From e1a2fb6593923ab3f53176cf009881656d564ac7 Mon Sep 17 00:00:00 2001 From: Amphitryon0 <17864580+Amphitryon0@users.noreply.github.com> Date: Thu, 5 Jun 2025 05:09:29 -0500 Subject: [PATCH] Clarify minor points --- Release-Process.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Release-Process.md b/Release-Process.md index 6c21bb2..612d611 100644 --- a/Release-Process.md +++ b/Release-Process.md @@ -10,7 +10,7 @@ Releases can only be created by [core developers](https://github.com/orgs/dolphi 1. Perform a translation sync with Transifex if creating a major release. 2. Create a new branch: `git checkout -b ` - * If creating a major release, name the branch `release-prep-YYMM` and specify the commit that the release should be based on. + * If creating a major release, name the branch `release-prep-YYMM` and base it on the `master` branch. * If creating a hotfix release, name the branch `release-prep-YYMMp` and base it on the tag of the last release. 3. Cherry pick any necessary commits. 4. Update the version constants in `CMake/ScmRevGen.cmake`, and commit the result. @@ -21,7 +21,7 @@ Releases can only be created by [core developers](https://github.com/orgs/dolphi 5. Push the branch to GitHub: `git push -u origin `. 6. Smoke test the produced builds. * The builds can be downloaded at `https://dolphin-emu.org/download/list/release-prep-YYMM/1/`. - * Now is the time to fix any last-minute issues. Additional builds can be created by pushing new commits to GitHub. **Remember that the version constants commit should be the last one in the branch**, so the branch should be rebased or abandoned in favor of a fresh one. + * Now is the time to fix any last-minute issues. Additional builds can be created by pushing new commits to GitHub (using `--force-with-lease`). **Remember that the version constants commit should be the last one in the branch**, so the branch should be rebased or abandoned in favor of a fresh one. 7. Create an **annotated** tag: `git tag -a -m "Release for some date"` 8. Push the tag to GitHub: `git push origin `. 9. The release builds will automatically show up on the normal download page.