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

[20.09] nomad: 0.11.4 -> 0.11.8, 0.12.2 -> 0.12.9 #106416

Merged
merged 11 commits into from Dec 17, 2020
Merged

[20.09] nomad: 0.11.4 -> 0.11.8, 0.12.2 -> 0.12.9 #106416

merged 11 commits into from Dec 17, 2020

Conversation

jonringer
Copy link
Contributor

@jonringer jonringer commented Dec 9, 2020 •
edited

Motivation for this change

closes: #106213
closes: #106215

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.

@jonringer jonringer changed the title nomad: 0.11.4 -> 0.11.7 [20.09] nomad: 0.11.4 -> 0.11.7 Dec 9, 2020
amaxine
amaxine reviewed Dec 11, 2020
View reviewed changes
Copy link
Contributor

@amaxine amaxine left a comment

Choose a reason for hiding this comment

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

Based on what I was told last time I did a backport like this (and the docs I was pointed to, CONTRIBUTING.md#backporting-changes), shouldn't this cherry-pick individual commits for each version bump, i.e.:
0.12:
168a85b
d63af62
dff0cad
ed6f710
e8469ca

0.11:
decc5fb
2ff401d
2f87869

@jonringer
Copy link
Contributor Author

Based on what I was told last time I did a backport like this (and the docs I was pointed to, CONTRIBUTING.md#backporting-changes), shouldn't this cherry-pick individual commits for each version bump, i.e.:

Yes, this is me just being lazy

@amaxine
Copy link
Contributor

amaxine commented Dec 17, 2020

Would probably be worth it to include bumps from #106827 too.

@drewrisinger drewrisinger mentioned this pull request Dec 17, 2020
Merged
10 tasks
@jonringer jonringer changed the title [20.09] nomad: 0.11.4 -> 0.11.7 [20.09] nomad: 0.11.4 -> 0.11.8, 0.12.2 -> 0.12.9 Dec 17, 2020
@amaxine
Copy link
Contributor

amaxine commented Dec 17, 2020

Result of nixpkgs-review pr 106416 run on x86_64-linux 1

2 packages built:
  • nomad
  • nomad_0_12

@amaxine
Copy link
Contributor

amaxine commented Dec 17, 2020

LGTM, but the last two commits made me realise that Nomad 0.11/0.12 was never pinned to go 1.14 in 20.09, see #96414.

Not sure what's the feeling on backporting that change too.

amaxine
amaxine approved these changes Dec 17, 2020
View reviewed changes
Copy link
Contributor

@amaxine amaxine left a comment

Choose a reason for hiding this comment

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

Still LGTM.

Result of nixpkgs-review pr 106416 run on x86_64-linux 1

2 packages built:
  • nomad
  • nomad_0_12

amaxine and others added 11 commits December 17, 2020 09:50
nomad: 0.12.2 -> 0.12.3
47198a5 
(cherry picked from commit 168a85b)
nomad: Pin to go1.14 for 0.11 and 0.12
a5d95cd 
This commit pins go versions for nomad 0.11 and 0.12. Future versions of
Nomad should have their versions pinned from the beginning, even if they
support the latest-at-the-time version of Go to prevent accidental
version bumps on unsupported go versions.

See NixOS#96414 for further discussion
around this change.

(cherry picked from commit 329a922)
nomad: 0.12.3 -> 0.12.4
67b408a 
(cherry picked from commit d63af62)
nomad_0_12: 0.12.4 -> 0.12.5
8f4767f 
(cherry picked from commit dff0cad)
nomad_0_12: 0.12.5 -> 0.12.6
bedf9d1 
(cherry picked from commit ed6f710)
nomad_0_12: 0.12.6 -> 0.12.7
65b363b 
(cherry picked from commit e8469ca)
nomad_0_12: 0.12.7 -> 0.12.9
83ba2bc 
(cherry picked from commit 582abe1)
nomad_0_11: 0.11.4 -> 0.11.5
3b8133c 
(cherry picked from commit decc5fb)
nomad_0_11: 0.11.5 -> 0.11.6
32e28ea 
(cherry picked from commit 2ff401d)
@jonringer
nomad_0_11: 0.11.6 -> 0.11.7
3f4ceb1 
(cherry picked from commit 2f87869)
nomad_0_11: 0.11.7 -> 0.11.8
16edbb1 
(cherry picked from commit de94bb4)
@jonringer
Copy link
Contributor Author

LGTM, but the last two commits made me realise that Nomad 0.11/0.12 was never pinned to go 1.14 in 20.09, see #96414.
Not sure what's the feeling on backporting that change too.

backported

amaxine
amaxine approved these changes Dec 17, 2020
View reviewed changes
Copy link
Contributor

@amaxine amaxine left a comment

Choose a reason for hiding this comment

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

Still LGTM 😅

@jonringer jonringer merged commit de7b7f9 into NixOS:release-20.09 Dec 17, 2020
@jonringer jonringer deleted the bump-nomad-2009 branch December 17, 2020 19:31
@jonringer
Copy link
Contributor Author

thanks @maxeaubrey

This was referenced Feb 2, 2021
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amaxine amaxine amaxine approved these changes

@endocrimes endocrimes Awaiting requested review from endocrimes

@rushmorem rushmorem Awaiting requested review from rushmorem

Assignees
No one assigned
Labels
1.severity: security 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jonringer @amaxine @stigtsp @endocrimes