299a181477
Turns out if :<something> is passed, a local branch is updated, which can conflict if the PR branch starts with "pr". I tried to avoid that with the original code but apparently that didn't work! https://github.com/NixOS/nixpkgs/actions/runs/11284183639/job/31384967152?pr=347822 Fetching the PR commit history From https://github.com/linj-fork/nixpkgs * [new branch] pr/kanata-add-version-check -> fork/pr error: cannot lock ref 'refs/remotes/fork/pr/kanata-add-version-check': 'refs/remotes/fork/pr' exists; cannot create 'refs/remotes/fork/pr/kanata-add-version-check' ! [new branch] pr/kanata-add-version-check -> fork/pr/kanata-add-version-check (unable to update local ref) error: some local refs could not be updated; try running |
||
---|---|---|
.. | ||
codeowners-validator | ||
nixpkgs-vet | ||
request-reviews | ||
default.nix | ||
nixpkgs-vet.sh | ||
OWNERS | ||
pinned-nixpkgs.json | ||
README.md | ||
update-pinned-nixpkgs.sh |
CI support files
This directory contains files to support CI, such as GitHub Actions and Ofborg.
This is in contrast with maintainers/scripts
which is for human use instead.
Pinned Nixpkgs
CI may need certain packages from Nixpkgs.
In order to ensure that the needed packages are generally available without building,
pinned-nixpkgs.json
contains a pinned Nixpkgs version tested by Hydra.
Run update-pinned-nixpkgs.sh
to update it.
ci/nixpkgs-vet.sh BASE_BRANCH [REPOSITORY]
Runs the nixpkgs-vet
tool on the HEAD commit, closely matching what CI does. This can't do exactly the same as CI, because CI needs to rely on GitHub's server-side Git history to compute the mergeability of PRs before the check can be started.
In turn, when contributors are running this tool locally, we don't want to have to push commits to test them, and we can also rely on the local Git history to do the mergeability check.
Arguments:
BASE_BRANCH
: The base branch to use, e.g. master or release-24.05REPOSITORY
: The repository from which to fetch the base branch. Defaults to https://github.com/NixOS/nixpkgs.git.
ci/nixpkgs-vet
This directory contains scripts and files used and related to nixpkgs-vet
, which the CI uses to implement pkgs/by-name
checks, along with many other Nixpkgs architecture rules.
See also the CI GitHub Action.
ci/nixpkgs-vet/update-pinned-tool.sh
Updates the pinned nixpkgs-vet
tool in ci/nixpkgs-vet/pinned-version.txt
to the latest release.
Each release contains a pre-built x86_64-linux
version of the tool which is used by CI.
This script currently needs to be called manually when the CI tooling needs to be updated.
Why not just build the tooling right from the PRs Nixpkgs version?
- Because it allows CI to check all PRs, even if they would break the CI tooling.
- Because it makes the CI check very fast, since no Nix builds need to be done, even for mass rebuilds.
- Because it improves security, since we don't have to build potentially untrusted code from PRs. The tool only needs a very minimal Nix evaluation at runtime, which can work with readonly-mode and restrict-eval.