Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to not use direct pushes anymore #70

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to not use direct pushes anymore #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93417c7
Update Final-Release.md to not use direct pushes anymore
infinisil Aug 13, 2023
ac55159
Update Branch-Off.md to not require direct pushes
infinisil Aug 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/Branch-Off.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,11 @@ Update metadata on the release branch, create its staging branches and tag the r

1. Add `SUPPORT_END=YYYY-MM-DD` to `osReleaseContents` in `nixos/modules/misc/version.nix`.

1. Commit the changes from the previous steps

```bash
git commit -m "$NEWVER beta release" -S
```
1. Commit the changes from the previous steps to a pull request to the release branch and merge it

1. Create the staging branches
```bash
git pull
git branch staging-$NEWVER
git branch staging-next-$NEWVER
```
Expand All @@ -93,7 +90,7 @@ Update metadata on the release branch, create its staging branches and tag the r

```bash
git tag --annotate --message="Release $NEWVER-beta" $NEWVER-beta
git push upstream master release-$NEWVER $NEWVER-beta staging-$NEWVER staging-next-$NEWVER
git push upstream release-$NEWVER $NEWVER-beta staging-$NEWVER staging-next-$NEWVER
Comment on lines -96 to +93
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why master is included here, seems like a mistake since this section is about the release branch.

And btw, new branches don't count as directly pushed commits under GitHub, and neither do tags, so this works fine

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's not pushed to master, we lose the beta tag on the next master commit objects, don't we?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh TIL that tag objects are an actual thing and not just a pointer to Git commits. Will need some thought

```

1. Create jobsets on hydra by contacting the infrastructure team and start the evaluation on all new jobsets.
Expand Down
16 changes: 5 additions & 11 deletions src/Final-Release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export NEWVER=23.05

### On the master branch

1. Create these PRs on master and backport to the release branch:
1. Create and merge a PR for master with commits to:

1. Update `rl-$NEWVER.section.md` with the final release date.

Expand All @@ -118,23 +118,17 @@ export NEWVER=23.05

Examples: [22.11](https://github.com/NixOS/nixpkgs/commit/f1b9cc23aa8b1549dd7cb53dbe9fc950efc97646#diff-eca12c0a30e25b4b46522ebf89465a03ba72a03f540796c979137931d8f92055)

1. Commit and push all changes.

```bash
git commit -m "Release NixOS $NEWVER" -S
git push upstream master
```

### On the release branch

1. Switch to the release branch
1. Create and merge a backport PR of the above

1. Switch to the release branch and update it to include commit of the merged backport PR

```bash
git switch release-$NEWVER
git pull
```

1. Cherry-pick the release commit from master

1. Tag the release **on the release branch**:

```bash
Expand Down