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

cri-o: 1.17.3 -> 1.18.0 #85869

Merged
merged 1 commit into from Apr 28, 2020
Merged

cri-o: 1.17.3 -> 1.18.0 #85869

merged 1 commit into from Apr 28, 2020

Conversation

@saschagrunert
Copy link
Member

saschagrunert commented Apr 23, 2020

Motivation for this change

Update CRI-O to the latest version.

This won't build because I need at least go 1.13 for this. @zowoq @marsam @vdemeester do you know if I can enforce a specific go version for buildGoPackage?

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.
@saschagrunert
Copy link
Member Author

saschagrunert commented Apr 23, 2020

@GrahamcOfBorg build cri-o

@vdemeester
Copy link
Member

vdemeester commented Apr 23, 2020

@saschagrunert Also I can see that cri-o switch to using go modules, so we should be able to use buildGoModule in this derivation, shouldn't we ? 👼

@marsam
Copy link
Contributor

marsam commented Apr 23, 2020

you may need to remove this line:

buildGoPackage = buildGo112Package;

@Mic92
Copy link
Contributor

Mic92 commented Apr 23, 2020

1 similar comment
@jonringer
Copy link
Contributor

jonringer commented Apr 23, 2020

@zowoq
Copy link
Contributor

zowoq commented Apr 23, 2020

@saschagrunert Do you want to add the commit from #85682 to this PR?

@srhb
Copy link
Contributor

srhb commented Apr 24, 2020

do you know if I can enforce a specific go version for buildGoPackage?

Easiest is probably buildGo113Package (or buildGo113Module if you go down that route)

@saschagrunert saschagrunert mentioned this pull request Apr 24, 2020
7 of 10 tasks complete
@saschagrunert saschagrunert force-pushed the saschagrunert:crio branch from cd64aba to 256e0c6 Apr 24, 2020
@saschagrunert
Copy link
Member Author

saschagrunert commented Apr 24, 2020

Thank you for all of your hints! I picked in the changes of #85682, using now buildGoModule and switched to the standard go version as well.

@GrahamcOfBorg eval

The configuration in the module has to be changed as well, but I'd like to do that in another PR.

@zowoq
Copy link
Contributor

zowoq commented Apr 24, 2020

I don't think buildGoModule is needed as the go deps are already vendored?

@ofborg ofborg bot requested a review from kalbasit Apr 24, 2020
@vdemeester
Copy link
Member

vdemeester commented Apr 24, 2020

I don't think buildGoModule is needed as the go deps are already vendored?

Right, I thought of that too after commenting 😅. With go 1.14, go build will use the vendor folder if it's present (à-la go build -mod=vendor). I wonder if long-term we should have only one buildGo… function that would support all the thing 👼.

@saschagrunert
Copy link
Member Author

saschagrunert commented Apr 24, 2020

I don't think buildGoModule is needed as the go deps are already vendored?

Yeah but since buildGoPackage is explicitly mentioned as "legacy" I still would like to stick to the new way. WDYT?

@vdemeester
Copy link
Member

vdemeester commented Apr 24, 2020

I don't think buildGoModule is needed as the go deps are already vendored?

Yeah but since buildGoPackage is explicitly mentioned as "legacy" I still would like to stick to the new way. WDYT?

Maybe but I don't think we should hold merge this bump for that 👼 (it could be done as a follow-up)

- Make buildtags being able to set via the BUILDTAGS environment
- Switch to go 1.14

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
@saschagrunert saschagrunert force-pushed the saschagrunert:crio branch from 256e0c6 to 1ae9631 Apr 24, 2020
@saschagrunert
Copy link
Member Author

saschagrunert commented Apr 24, 2020

Okay cool I reverted some of my changes and sticked to buildGoPackage

@zowoq
zowoq approved these changes Apr 24, 2020
@zowoq
Copy link
Contributor

zowoq commented Apr 28, 2020

Could a committer merge this please? cc @marsam @Mic92

@marsam marsam merged commit ce7272b into NixOS:master Apr 28, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
cri-o, cri-o.passthru.tests on aarch64-linux Success
Details
cri-o, cri-o.passthru.tests on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1ae9631"; rev="1ae963172557035eb07fd27440ea0869770efdb7"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1ae9631"; rev="1ae963172557035eb07fd27440ea0869770efdb7"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1ae9631"; rev="1ae963172557035eb07fd27440ea0869770efdb7"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1ae9631"; rev="1ae963172557035eb07fd27440ea0869770efdb7"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1ae9631"; rev="1ae963172557035eb07fd27440ea0869770efdb7"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1ae9631"; rev="1ae963172557035eb07fd27440ea0869770efdb7"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1ae9631"; rev="1ae963172557035eb07fd27440ea0869770efdb7"; } ./pkgs/t
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
@saschagrunert saschagrunert deleted the saschagrunert:crio branch Apr 29, 2020
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

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