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

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

Merged
merged 1 commit into from Jan 20, 2020

Conversation

@curiousleo
Copy link
Contributor

@curiousleo curiousleo commented Jan 10, 2020

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
.github/CONTRIBUTING.md Outdated Show resolved Hide resolved
@curiousleo curiousleo force-pushed the curiousleo:patch-2 branch from 748e283 to c9c0685 Jan 10, 2020
@curiousleo
Copy link
Contributor Author

@curiousleo curiousleo commented Jan 10, 2020

PTAL

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

@nh2 nh2 left a comment

Looks sensible and clear to me.

@vcunat
vcunat approved these changes Jan 19, 2020
@grahamc grahamc merged commit da9c031 into NixOS:master Jan 20, 2020
12 checks passed
12 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@curiousleo curiousleo deleted the curiousleo:patch-2 branch Jan 20, 2020
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Jan 20, 2020

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

@curiousleo curiousleo commented Jan 21, 2020

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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.