Conversation
|
Is it intended that the target branch is |
3ad6bf7 to
db442d4
Compare
Yes, unfortunately GitHub doesn't really supported stacked PRs, so if you have a PR "A" and use that as the base of another PR "B", GH includes the changes of "A" in the diff view of "B", if both of them use main as the base branch. Also, if you merge "A" now, by doing a fast forward, GitHub doesn't update the diff of "B" (and any descendants) and still includes the commits and changes of "A". But if you set the base branch of "B" to the branch of "A", only those commits that are in "B" but not in "A" are shown in the diff view of "B", and if "A" is merged and the branch of "A" is deleted, GH automatically updates "B" to instead target the main branch (see #62 for example). |
db442d4 to
fbab3f6
Compare
840dd1d to
551887d
Compare
cameronraysmith
left a comment
There was a problem hiding this comment.
Works for me. Many thanks for this Defelo.
Resolves #49.
README.md
Outdated
| extra-substituters = https://nix-community.cachix.org | ||
| extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= | ||
| ``` | ||
|
|
There was a problem hiding this comment.
From the gh cli you can set this via
gh variable set -R [fork-username]/nixpkgs-review-gha EXTRA_NIX_CONFIG <<'EOF'
extra-substituters = https://nix-community.cachix.org
extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
EOFand then you should find something like the following in the workflow run logs
Run cachix/install-nix-action@v31
with:
extra_nix_config: build-dir = /nix/build
sandbox = true
system = x86_64-linux
extra-substituters = https://nix-community.cachix.org/
extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
enable_kvm: true
set_as_trusted_user: true
env:
PR_NUMBER: NNNNNN
TMPDIR: /mnt/tmp.jqTjgZ6hYEfbab3f6 to
a4df497
Compare
551887d to
14dae8f
Compare
No description provided.