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

Fix hydra on release-17.09 by upgrading: 2017-09-14 -> 2017-10-26 #31620

Merged
merged 1 commit into from Nov 13, 2017
Merged

Fix hydra on release-17.09 by upgrading: 2017-09-14 -> 2017-10-26 #31620

merged 1 commit into from Nov 13, 2017

Conversation

basvandijk
Copy link
Member

@basvandijk basvandijk commented Nov 13, 2017 •
edited

Motivation for this change

Currently hydra fails to build on release-17.09 because nixUnstable got upgraded:

$ nix-build -A hydra
these derivations will be built:
  /nix/store/xii3bpaz4cfc5hgzk0iwqa8gr2x4in8c-hydra-2017-09-14.drv
building path(s) ‘/nix/store/al2c699sjrrsm6kpqklmlvm2siynqpm1-hydra-2017-09-14’
...
hydra-eval-jobs.cc:13:26: fatal error: common-opts.hh: No such file or directory
 #include "common-opts.hh"
                          ^
compilation terminated.

This is fixed by cherry-picking 286faa2 on release-17.09 which upgrades hydra to the latest HEAD which can build against the latest nixUnstable (NixOS/hydra@2cdc84f).

@orivej ping.

Things done

nix-build nixos/tests/hydra.nix succeeds.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@orivej
hydra: 2017-09-14 -> 2017-10-26
d82afbe 
Fixes the build with the current nixUnstable.

(cherry picked from commit 286faa2)
@orivej
Copy link
Contributor

orivej commented Nov 13, 2017

Thank you. Release maintainers don't like cherry picks without the reference to the original commit (git cherry-pick -x), so I had to add it.

@orivej orivej merged commit 5fbc4e5 into NixOS:release-17.09 Nov 13, 2017
@LnL7
Copy link
Member

LnL7 commented Nov 13, 2017

I think we should add hydra to the release job.

@basvandijk
Copy link
Member Author

@orivej TIL about cherry-pick -x. Thanks.

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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@basvandijk @orivej @LnL7