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

[19.09] chromium: 80.0.3987.163 -> 81.0.4044.92 (backport) #84709

Merged
merged 4 commits into from
Apr 8, 2020

Conversation

primeos
Copy link
Member

@primeos primeos commented Apr 8, 2020

Motivation for this change

Backport of #84671.

Testing status
platform attribute status tester
x86_64 chromium ✔️ @Frostman
x86_64 nixosTests.chromium ✔️ @Frostman
x86_64 google-chrome ✔️ @primeos
aarch64 chromium - -
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.

primeos added 4 commits April 8, 2020 13:15
This can e.g. save around 150k lines of unnecessary log messages which
take up around 66% of the total lines (based on a log of 80.0.3987.100):
29527 warning: unknown warning option '-Wno-bitwise-conditional-parentheses'; did you mean '-Wno-bitwise-op-parentheses'? [-Wunknown-warning-option]
29527 warning: unknown warning option '-Wno-builtin-assume-aligned-alignment' [-Wunknown-warning-option]
29527 warning: unknown warning option '-Wno-deprecated-copy'; did you mean '-Wno-deprecated'? [-Wunknown-warning-option]
29527 warning: unknown warning option '-Wno-final-dtor-non-final-class'; did you mean '-Wno-abstract-final-class'? [-Wunknown-warning-option]
29527 warning: unknown warning option '-Wno-implicit-int-float-conversion'; did you mean '-Wno-implicit-float-conversion'? [-Wunknown-warning-option]

(cherry picked from commit 9f39148)
This fixes the patch phase.
I missed this problem in NixOS#83956.

(cherry picked from commit 36c7123)
This patch was also backported to M81 [0][1].

[0]: https://chromium-review.googlesource.com/c/chromium/src/+/2091896
[1]: chromium/chromium@bbf0fad

(cherry picked from commit ff3bc51)
@primeos primeos added 2.status: work-in-progress This PR isn't done 1.severity: security Issues which raise a security issue, or PRs that fix one labels Apr 8, 2020
@flokli
Copy link
Contributor

flokli commented Apr 8, 2020

@primeos can you elaborate on the status: work-in-progress label?

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Apr 8, 2020
@primeos
Copy link
Member Author

primeos commented Apr 8, 2020

@flokli of course. Tbh, I actually only add it to save @GrahamcOfBorg resources, as the build would timeout anyway. But if I think about it we probably have sufficient resources anyway (though sometimes the queuing times go up, IIRC) and it's probably a bit confusing.

I can stop using it in future Chromium PRs if you want.

Edit: But if I think about it, it also makes some sense as we're still testing this PR.

@Frostman
Copy link
Member

Frostman commented Apr 8, 2020

chromium tests passed (x86_64)

@primeos primeos merged commit 7770f3a into NixOS:release-19.09 Apr 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 2.status: work-in-progress This PR isn't done 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants