-
-
Notifications
You must be signed in to change notification settings - Fork 335
flake: add ci.buildbot
output
#3410
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
Conversation
9b6c62a
to
5b85eb3
Compare
This comment was marked as resolved.
This comment was marked as resolved.
4c1c386
to
8bac46b
Compare
Adds top-level and per-system `ci.buildbot` option for defining tests to build on buildbot. These are exposed as the `ci.buildbot.«system»` flake output.
Most still run on all platforms, but many now only run on x86_64-linux.
8bac46b
to
739f9e2
Compare
739f9e2
to
6c456ef
Compare
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This pull request, with head sha This pull request will be automatically closed by GitHub.As soon as GitHub detects that the sha It is possible for this pull request to remain open if this detection does not happen, this usually happens when a force-push is done on this branch |
Successfully created backport PR for |
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin nixos-24.11
git worktree add -d .worktree/backport/nixos-24.11/3410 origin/nixos-24.11
cd .worktree/backport/nixos-24.11/3410
git switch --create backport/nixos-24.11/3410
git cherry-pick -x e18d3fb2804908fc00629e9139059d26a3ff4dcb 74e6ada9d1545d3a3c515ea3d85ad6766dc00df5 7d0ac00557dd97d4353cfcad8ffb65163ac1d782 6c456efc96f60213019460046d07f5691e0fafa3 |
Git push to origin failed for nixos-25.05 with exitcode 1 |
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin nixos-24.11
git worktree add -d .worktree/backport/nixos-24.11/3410 origin/nixos-24.11
cd .worktree/backport/nixos-24.11/3410
git switch --create backport/nixos-24.11/3410
git cherry-pick -x e18d3fb2804908fc00629e9139059d26a3ff4dcb 74e6ada9d1545d3a3c515ea3d85ad6766dc00df5 7d0ac00557dd97d4353cfcad8ffb65163ac1d782 6c456efc96f60213019460046d07f5691e0fafa3 |
Looked into it, there's too many differences between nixvim 24.11 and 25.05 to be worth backporting when we'll be dropping 24.11 support soon anyway. |
This seems to be caused by the backport workflow running twice. We should be using the same conditions as nixpkgs, but maybe something is wrong? |
Background
I've long complained that buildbot is too tightly coupled to our flake's
checks
output; the same one used bynix flake check
. Being unable to customise what buildbot builds has been a pain point for a while.Turns out around seven months ago buildbot added a per-repo config file in nix-community/buildbot-nix#318.
The available options are documented on its readme, here. Currently only
lock_file
andattribute
, but the latter enables this PR!Core change
This PR adds an explicit
ci.buildbot
output to the flake, which we configure buildbot to use instead of the defaultchecks
output via abuildbot-nix.toml
file.This allows us to specify a different set of tests for
nix flake check
and buildbot.Additional changes
This PR is not focused on fully taking advantage of the new separation, however it does make some minor tweaks:
🚀packages
are now only built on x86_64-linux, but are built bynix flake check
on all systemstests/default.nix
are also only built on x86_64-linux.fetch-tests
) are still built on all platforms.Without this PR buildbot had 288 builds, with just tests it has 205, with tests and packages it has 214, with tests (mostly single system) and packages (all systems), it has 235.
Future work:
ci.buildbot
option/output has been designed to accommodateci.*
sibling options, such as GitHub Actions job matrices.nix flake check
packages
to be built bynix flake check
?Related: