Skip to content

Fix release procedure #10

@molguin92

Description

@molguin92

Our current release procedure is:

  1. Cut a release branch from main.
  2. Make the release with make release-x.
  3. Push the release commit and release tag to the remote.
  4. Make and merge a PR.

However, this does not work on Github, since Github's "rebase and merge" strategy results in commit hashes changing after the merge. In turn, this means that the release tag create on the release branch now points to a commit not on the main branch. At that point, we need to delete the existing tag and re-tag on main.

We should fix this procedure to either

  • Don't create a tag on the release branch and manually require tagging on main after merging.
  • Prevent PRs from being merged from the web UI and instead require merges to be done via the git CLI to ensure proper fast-forwarding.

Sources:

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions