Skip to content

CI: build nixos manual also on PRs targeting secondary branches #509875

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.

Sign up for GitHub

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

Open
m1-s wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −3
Open

CI: build nixos manual also on PRs targeting secondary branches #509875

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@ jobs:
run: echo "${{ matrix.systems }}" | xargs -n1 nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A shell --argstr system

- name: Build NixOS manual
if: |
contains(matrix.builds, 'manual-nixos') && !cancelled() &&
contains(fromJSON(inputs.baseBranch).type, 'primary')
if: contains(matrix.builds, 'manual-nixos') && !cancelled()
Copy link
Copy Markdown
Member

@Ma27 Ma27 Apr 14, 2026

Choose a reason for hiding this comment

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

cc @NixOS/nixpkgs-ci

Doesn't that mean we try to schedule manual builds for staging which will timeout anyways after consuming a whole lot of resources?

Perhaps we should explicitly allow staging-nixos here as well?
(Mostly a question to the CI team, not a proposal since I'm not sure I understand it correctly)

Copy link
Copy Markdown
Member

@vcunat vcunat Apr 14, 2026

Choose a reason for hiding this comment

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

It certainly seems an overkill to build the manual when targeting staging or staging-25.11.

Copy link
Copy Markdown
Contributor

@MattSturgeon MattSturgeon Apr 14, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

Going of memory here, so I could be wrong. But I believe the manual is built using packages from the ci-pinned nixpkgs. Only the markdown sources come from the PR branch.

Copy link
Copy Markdown
Contributor Author

@m1-s m1-s Apr 15, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

I think thats true for the nixpkgs manual but not for the nixos manual.

manual-nixos = (import ../nixos/release.nix { }).manual.${system} or null;
manual-nixpkgs = (import ../doc { inherit pkgs; });

In the nixos/release.nix nixpkgs is declared as:

  nixpkgs ? {
    outPath = cleanSource ./..;
    revCount = 708350;
    shortRev = "gfedcba";
  },

So I assume the nixos manual uses the current state that is in the PR. Is rebuilding the nixos manual feasible in PRs to staging-nixos or does it cost too much resources? Do we only want to allow staging-nixos or all secondary branches?

run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A manual-nixos --out-link nixos-manual

- name: Build Nixpkgs manual
Expand Down
Loading