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

prometheus: 2.22.1 -> 2.22.2 #104213

Merged
merged 2 commits into from Nov 19, 2020
Merged

prometheus: 2.22.1 -> 2.22.2 #104213

merged 2 commits into from Nov 19, 2020

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Nov 18, 2020

Motivation for this change

This stopped building after #102986, seems to be the only one affected.

Darwin tests have been broken since the 2.22 version bump.

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.

@@ -59,7 +59,7 @@ in buildGoPackage rec {
cp -a $src/console_libraries $src/consoles $out/etc/prometheus
'';

doCheck = true;
doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1
Copy link
Member

Choose a reason for hiding this comment

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

@Ma27 Ma27 merged commit f2201db into NixOS:master Nov 19, 2020
@zowoq zowoq deleted the prometheus branch November 19, 2020 10:31
@ghost
Copy link

ghost commented Nov 23, 2020

Tests are failing on x86_64-linux: https://hydra.nixos.org/build/130839618

@zowoq
Copy link
Contributor Author

zowoq commented Nov 23, 2020

Builds locally, can you reproduce the failure?

@ghost
Copy link

ghost commented Nov 23, 2020

Yes. One of my machines ran into this problem when building from master and Hydra produces the error as well. Interestingly OfBorg reported a successful build on the last commit in this PR's source branch. Maybe the problem only occured after merging it with the latest master changes. Reverting the "prometheus: 2.22.1 -> 2.22.2" commit definitely fixes the build.
Oh and I should clarify: Not the NixOS tests are failing but the package's checkPhase.

@zowoq
Copy link
Contributor Author

zowoq commented Nov 23, 2020

It's now building on hydra. https://hydra.nixos.org/build/131079975

@ghost
Copy link

ghost commented Nov 23, 2020

I was able to build both revisions on another machine, so it might just be some non-deterministic tests or the hosts running out of resources.

@WilliButz
Copy link
Member

Backported to 20.09 in c86f563 and 0e0e3ec (see #107469)

@WilliButz WilliButz added the 8.has: port to stable A PR already has a backport to the stable release. label Dec 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants