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

linux-hardkernel: 4.14.66-147 -> 4.14.69-148 #46791

Merged
merged 1 commit into from Sep 17, 2018
Merged

linux-hardkernel: 4.14.66-147 -> 4.14.69-148 #46791

merged 1 commit into from Sep 17, 2018

Conversation

qolii
Copy link
Contributor

@qolii qolii commented Sep 17, 2018

Motivation for this change

Simple update.

Successfully compiled and running now on my hardware.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@qolii qolii changed the base branch from master to staging September 17, 2018 19:09
@qolii qolii changed the base branch from staging to master September 17, 2018 19:09
@qolii
Copy link
Contributor Author

qolii commented Sep 17, 2018

Ok, so, I tried to change this to point at staging instead, but it went nuts and said there were now 700 commits. Not seen that before. Would closing and re-opening the PR from the same branch fix that?

@xeji
Copy link
Contributor

xeji commented Sep 17, 2018

@qolii in addition to changing base to staging for the PR (you did that), you need to rebase your branch on staging locally and force-push to github. Before you do that, you get lots of unwanted commits because github looks for the common ancestor of your PR branch and staging...

However, I think this PR can be merged into master, the number of rebuilds isn't too high.

@qolii
Copy link
Contributor Author

qolii commented Sep 17, 2018

@xeji, ooh I see. I was hoping since it was a change to one file (and that file is the same in both branches), git would be smart enough to figure it out. It has worked for me in the past, at least.

But thanks, I'll remember this for next time. Feel free to merge, if you're happy.

@xeji
Copy link
Contributor

xeji commented Sep 17, 2018

It has worked for me in the past, at least.

You can be lucky, for instance if staging has just been merged into master.
Anyway, since there's no point in having ofborg compile a kernel (and time out), let's merge this and observe on Hydra.

@xeji xeji merged commit 883b86e into NixOS:master Sep 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@qolii @xeji @GrahamcOfBorg