Skip to content

Comments

doc/hooks/meson.section.md: fix syntax to unbreak CI#263680

Closed
ghost wants to merge 1 commit intostaging-nextfrom
unknown repository
Closed

doc/hooks/meson.section.md: fix syntax to unbreak CI#263680
ghost wants to merge 1 commit intostaging-nextfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Oct 27, 2023

Description of changes

CI for staging-next is broken:

This fixes it.

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/)
  • 23.11 Release Notes (or backporting 23.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.

@github-actions github-actions bot added the 8.has: documentation This PR adds or changes documentation label Oct 27, 2023
@ghost ghost marked this pull request as ready for review October 27, 2023 00:37
@ghost ghost requested a review from vcunat October 27, 2023 00:38
@ghost
Copy link
Author

ghost commented Oct 27, 2023

Fixes

@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 Oct 27, 2023
@ghost ghost closed this Oct 27, 2023
@ghost ghost deleted the unbreak-staging branch October 27, 2023 08:07
@mweinelt
Copy link
Member

The manual on staging-next is still broken and this looks like it could be the fix. Why did you close the PR?

@vcunat
Copy link
Member

vcunat commented Oct 27, 2023

Should be resolved by 0fdb1ee

@ghost
Copy link
Author

ghost commented Oct 30, 2023

The manual on staging-next is still broken and this looks like it could be the fix. Why did you close the PR?

I think it got fixed on master and the github action that merges master to staging brought the fix over. When I rebased this branch I saw a merge conflict and figured somebody else had beat me to it. 😄

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: documentation This PR adds or changes documentation 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.

2 participants