cloudflare / cloudflare/ecdysis

Fix release procedure

Open
#10 0 comments 0 reactions 0 assignees View on GitHub
Dominant language
Rust
Stars
333
Forks
17
PR merge metrics
No merged PRs in 30d

Description

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:
- https://stackoverflow.com/questions/68878506/github-rebase-merge-creates-new-commit-hashes
- https://stackoverflow.com/questions/60597400/how-to-do-a-fast-forward-merge-on-github

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.