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

llvmPackages.compiler_rt: Fix version tests for git #354471

Merged
merged 1 commit into from
Nov 25, 2024

Conversation

pwaller
Copy link
Contributor

@pwaller pwaller commented Nov 8, 2024

Without these fixes, the git build currently fails because the tests are
out of date.

One is updated since it was fixed upstream, the other is still needed
for the git build, but testing version resulted in a test against the
unstable-* string and not the one with the version number in it.

While we're here, switch --replace for --replace-fail to reduce the log warning
spam.
(Edit: I've dropped this patch to avoid the giant darwin rebuild).

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Without these fixes, the git build currently fails because the tests are
out of date.

One is updated since it was fixed upstream, the other is still needed
for the git build, but testing `version` resulted in a test against the
`unstable-*` string and not the one with the version number in it.

Signed-off-by: Peter Waller <[email protected]>
@github-actions github-actions bot added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label Nov 8, 2024
@pwaller pwaller changed the title llvmPackages.compiler_rt: Fix compiler_rt version tests for git llvmPackages.compiler_rt: Fix version tests for git Nov 8, 2024
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild label Nov 8, 2024
@pwaller pwaller marked this pull request as ready for review November 8, 2024 16:03
@pwaller
Copy link
Contributor Author

pwaller commented Nov 8, 2024

I guess Use --replace-fail for substitutions is causing the darwin rebuilds. It could be dropped. Any opinions? I went ahead and dropped it in the hopes of avoiding rebuilds.

@pwaller
Copy link
Contributor Author

pwaller commented Nov 12, 2024

ofborg confirms there are fewer rebuilds now.

@RossComputerGuy
Copy link
Member

Result of nixpkgs-review pr 354471 run on aarch64-linux 1

2 packages failed to build:
  • tests.cc-wrapper.llvmTests.llvmPackages_19.libcxx
  • tests.cc-wrapper.supported
12 packages built:
  • llvmPackages_19.clangNoLibc (llvmPackages_19.clangNoLibcWithBasicRt)
  • llvmPackages_19.clangNoLibcxx (llvmPackages_19.clangWithLibcAndBasicRt)
  • llvmPackages_19.clangUseLLVM
  • llvmPackages_19.clangWithLibcAndBasicRtAndLibcxx
  • llvmPackages_19.compiler-rt-no-libc
  • llvmPackages_19.compiler-rt-no-libc.dev
  • llvmPackages_19.libcxx
  • llvmPackages_19.libcxx.dev
  • llvmPackages_19.libcxxClang
  • llvmPackages_19.libcxxStdenv
  • llvmPackages_19.libunwind
  • llvmPackages_19.libunwind.dev

@RossComputerGuy
Copy link
Member

tests.cc-wrapper.llvmTests.llvmPackages_19.libcxx fails due to mktemp not being found, tests.cc-wrapper.supported fails with no output.

@paparodeo
Copy link
Contributor

tests.cc-wrapper.llvmTests.llvmPackages_19.libcxx fails due to mktemp not being found, tests.cc-wrapper.supported fails with no output.

these were broken a month or so ago and should be fixed now with the recent staging-next merge.

@pwaller
Copy link
Contributor Author

pwaller commented Nov 22, 2024

Friendly one week ping.

@RossComputerGuy
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 354471


aarch64-linux

✅ 14 packages built:
  • llvmPackages_19.clangNoLibc (llvmPackages_19.clangNoLibcWithBasicRt)
  • llvmPackages_19.clangNoLibcxx (llvmPackages_19.clangWithLibcAndBasicRt)
  • llvmPackages_19.clangUseLLVM
  • llvmPackages_19.clangWithLibcAndBasicRtAndLibcxx
  • llvmPackages_19.compiler-rt-no-libc
  • llvmPackages_19.compiler-rt-no-libc.dev
  • llvmPackages_19.libcxx
  • llvmPackages_19.libcxx.dev
  • llvmPackages_19.libcxxClang
  • llvmPackages_19.libcxxStdenv
  • llvmPackages_19.libunwind
  • llvmPackages_19.libunwind.dev
  • tests.cc-wrapper.llvmTests.llvmPackages_19.libcxx
  • tests.cc-wrapper.supported

Copy link
Member

@RossComputerGuy RossComputerGuy left a comment

Choose a reason for hiding this comment

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

i approb

@RossComputerGuy RossComputerGuy merged commit b994c8c into NixOS:master Nov 25, 2024
41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants