tweak to fix issues found in first ever hotfix release

OatmealDome 2025-04-24 02:05:49 -04:00
parent 0bbd061790
commit da688ae146

@ -17,15 +17,17 @@ Releases can only be created by [core developers](https://github.com/orgs/dolphi
* Set `DOLPHIN_VERSION_MAJOR` to `YYMM`. * Set `DOLPHIN_VERSION_MAJOR` to `YYMM`.
* Set `DOLPHIN_VERSION_MINOR` to the patch number. If creating a hotfix release, use the number corresponding to the patch letter (for example, `a` is `1`, `b` is `2`, etc). Otherwise, set to `0`. * Set `DOLPHIN_VERSION_MINOR` to the patch number. If creating a hotfix release, use the number corresponding to the patch letter (for example, `a` is `1`, `b` is `2`, etc). Otherwise, set to `0`.
* This field must be set to a number [as CPack does not support non-numerical values in the minor or patch version fields](https://gitlab.kitware.com/cmake/cmake/-/issues/19310). * This field must be set to a number [as CPack does not support non-numerical values in the minor or patch version fields](https://gitlab.kitware.com/cmake/cmake/-/issues/19310).
* **The version constants commit should be the last one in the branch.**
5. Push the branch to GitHub: `git push -u origin <branch name>`. 5. Push the branch to GitHub: `git push -u origin <branch name>`.
6. Smoke test the produced builds. 6. Smoke test the produced builds.
* The builds can be downloaded at `https://dolphin-emu.org/download/list/release-prep-YYMM/1/`. * 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. * 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.
7. Create an **annotated** tag: `git tag -a <version> -m "Release for some date"` 7. Create an **annotated** tag: `git tag -a <version> -m "Release for some date"`
8. Push the tag to GitHub: `git push origin <version>`. 8. Push the tag to GitHub: `git push origin <version>`.
9. The release builds will automatically show up on the normal download page. 9. The release builds will automatically show up on the normal download page.
10. Publish the corresponding Progress Report, if any. 10. Publish the corresponding Progress Report, if any.
* After publishing, post the link to the Progress Report onto Twitter, Mastodon, Bluesky, etc. * After publishing, post the link to the Progress Report onto Twitter, Mastodon, Bluesky, etc.
11. Push the new release to the `beta` update track through the `Update Tracks` interface on the dolphin-emu.org admin panel. 11. Push the new release to the `beta` update track through the `Update Tracks` interface on the dolphin-emu.org admin panel.
11. Merge the release branch back into master: `git checkout master`, `git merge --no-ff <branch name>`. 12. If this is a regular release, merge the release branch back into `master`: `git checkout master`, `git merge --no-ff <branch name>`.
* `--no-ff` is important, as we require a merge commit. * `--no-ff` is important, as we require a merge commit.
13. If this is a hotfix release, cherry pick the version constants commit made in step 4 into `master`.