Skip to content

gss: re-enable tests#335288

Merged
alyssais merged 1 commit intoNixOS:masterfrom
deshaw:upstream-gss-test-fix
Aug 17, 2024
Merged

gss: re-enable tests#335288
alyssais merged 1 commit intoNixOS:masterfrom
deshaw:upstream-gss-test-fix

Conversation

@de11n
Copy link

@de11n de11n commented Aug 17, 2024

Two in-flight PRs (#327128 and #328673) both solved the same problem in a different way. This merges the best of both PRs and re-enables tests.

Description of changes

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.

Two in-flight PRs (NixOS#327128 and NixOS#328673) both solved the same problem in a different way. This merges the best of both PRs and re-enables tests.
@de11n de11n requested review from alyssais and vcunat August 17, 2024 05:02
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Aug 17, 2024
@alyssais alyssais merged commit b83b5ef into NixOS:master Aug 17, 2024
@alyssais
Copy link
Member

ah shit, this was the wrong target branch

@alyssais
Copy link
Member

Reverted in #335319. Please resubmit to staging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants