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.

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

Document how to backport a change into a release channel #77433

Merged
merged 1 commit into from Jan 20, 2020
Merged

Document how to backport a change into a release channel #77433

merged 1 commit into from Jan 20, 2020

Conversation

curiousleo
Copy link
Contributor

@curiousleo curiousleo commented Jan 10, 2020 •
edited

Motivation for this change

I keep forgetting to use git cherry-pick -x. So I wrote it down.

Preview here.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@curiousleo curiousleo changed the title CONTRIBUTING.md: add section "Backporting changes" Document how to backport a change into a release channel Jan 10, 2020
LnL7
LnL7 reviewed Jan 10, 2020
View reviewed changes
.github/CONTRIBUTING.md Outdated Show resolved Hide resolved
@curiousleo
Copy link
Contributor Author

PTAL

@curiousleo curiousleo requested a review from LnL7 January 13, 2020 07:42
grahamc
grahamc reviewed Jan 13, 2020
View reviewed changes
.github/CONTRIBUTING.md Outdated Show resolved Hide resolved
@curiousleo curiousleo force-pushed the patch-2 branch 2 times, most recently from d8287f4 to fbde4f8 Compare January 13, 2020 14:32
nh2
nh2 approved these changes Jan 18, 2020
View reviewed changes
Copy link
Contributor

@nh2 nh2 left a comment

Choose a reason for hiding this comment

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

Looks sensible and clear to me.

@grahamc grahamc merged commit da9c031 into NixOS:master Jan 20, 2020
@curiousleo curiousleo deleted the patch-2 branch January 20, 2020 13:35
@worldofpeace
Copy link
Contributor

Thank you soooo much for doing this @curiousleo ✨.
Been on my todo list for a minute.

Though it's still frustrating that we have multiple documents and we have to veer away from the nixpkgs manual.

@curiousleo
Copy link
Contributor Author

Thank you soooo much for doing this @curiousleo

My pleasure! I figured that after having to ask what the right cherry-pick incantation was I'd write it down :)

Though it's still frustrating that we have multiple documents and we have to veer away from the nixpkgs manual.

Yeah

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nh2 nh2 nh2 approved these changes

@vcunat vcunat vcunat approved these changes

@LnL7 LnL7 Awaiting requested review from LnL7

@grahamc grahamc Awaiting requested review from grahamc

Assignees
No one assigned
Labels
6.topic: policy discussion 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@curiousleo @worldofpeace @grahamc @nh2 @LnL7 @vcunat