The process for branching off stable releases of the module is really bad #53

New issue

Open

opened 2025-02-07 23:41:12 +00:00 by jade · 0 comments

jade commented

2025-02-07 23:41:12 +00:00

Owner

This needs to:

Maybe do the trick that lix itself does with git merge -s ours to make a funny commit so that the tag is included in the main branch without including the new tree contents in main.

Here's the state transition we want to happen:

Initial state:

flake.nix has a main lix url in it, and its lock file has some release of 2.92.0-dev before the actual release version.
A new release of Lix was just put out, so a release-2.92 branch and 2.92.0 tag have been made and pushed to forgejo.
version.json has something like 2.92.0-dev in it

Final state:

2.92.0 tag is an ancestor of main at the end
2.92.0 tag is an ancestor of release-2.92
2.92.0 tag has 2.92.0 in version.json.
release-2.92 will have release-2.92 in the flake.nix URL
2.92.0 tag will have a URL for lix 2.92.0 in the flake.nix.
main should still have the main URL for lix in flake.nix
main should have 2.93.0-dev in the version.json.

This needs to: - Maybe do the trick that lix itself does with `git merge -s ours` to make a funny commit so that the tag is included in the `main` branch without including the new tree contents in `main`. Here's the state transition we want to happen: Initial state: - `flake.nix` has a `main` lix url in it, and its lock file has some release of 2.92.0-dev before the actual release version. - A new release of Lix was just put out, so a `release-2.92` branch and `2.92.0` tag have been made and pushed to forgejo. - version.json has something like `2.92.0-dev` in it Final state: - `2.92.0` tag is an ancestor of `main` at the end - `2.92.0` tag is an ancestor of `release-2.92` - `2.92.0` tag has `2.92.0` in `version.json`. - `release-2.92` will have release-2.92 in the flake.nix URL - `2.92.0` tag will have a URL for lix 2.92.0 in the flake.nix. - `main` should still have the `main` URL for lix in flake.nix - `main` should have `2.93.0-dev` in the `version.json`.

👍 1