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

pkgs/top-level/release.nix: expose .build as a direct jobset for hydra #284090

Merged
merged 1 commit into from
Jan 26, 2024

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Jan 26, 2024

This matches jobsets for cross-jobs. This way it' will be a bit easier to automatically extract bootstrapTools for mass updates in #253713

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.05 Release Notes (or backporting 23.05 and 23.11 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.

This matches jobsets for cross-jobs. This way it' will be a bit easier
to automatically extract `bootstrapTools` for mass updates in
NixOS#253713
@trofi
Copy link
Contributor Author

trofi commented Jan 26, 2024

What is inconsistent today:

This PR fixes it.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jan 26, 2024
@lovesegfault lovesegfault merged commit 57fd1ef into NixOS:master Jan 26, 2024
24 checks passed
@trofi trofi deleted the hydra-expose-build-target branch January 26, 2024 21:33
@alyssais
Copy link
Member

Is there any point still having dist?

@trofi
Copy link
Contributor Author

trofi commented Jan 28, 2024

Good question! 45c7dd7 in 2015 added dist that explicitly lists all the files expected to land on tarballs.nixos.org to mirror what ${.build}/on-server/* build should contain. I think removing .dist makes sense.

trofi added a commit to trofi/nixpkgs that referenced this pull request Apr 4, 2024
The PR NixOS#284090 exposed `build`
target directly on hydra. We are using it now in
https://github.com/NixOS/nixpkgs/tree/master/maintainers/scripts/bootstrap-files
to generate bootstrap tarballs on `linux` and `darwin`.

`dist` was not very useful as it was a bit hard to link back to hydra
jobs that build it. Let's just drop it.
@trofi
Copy link
Contributor Author

trofi commented Apr 4, 2024

Proposed dist removal as:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 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.

3 participants