Skip to content
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

I can't merge a critical backport #7623

Closed
roberth opened this issue Jan 18, 2023 · 5 comments · Fixed by #7626
Closed

I can't merge a critical backport #7623

roberth opened this issue Jan 18, 2023 · 5 comments · Fixed by #7626

Comments

@roberth
Copy link
Member

roberth commented Jan 18, 2023

Describe the bug

I can't merge a critical backport because CI doesn't run.
I have push permission, but I am not an admin.

This happened while attempting to fix the release.
I was not able to trigger the Hydra job because of this, delaying the hotfix.

The backport:

Steps To Reproduce

  1. Make a backport using the label
  2. There's nothing I can click. PR state from my viewpoint is:
    Screenshot_2023-01-18_02-42-57
  3. My attempt to trigger the CI failed
$ git push
Enumerating objects: 1, done.
Counting objects: 100% (1/1), done.
Writing objects: 100% (1/1), 187 bytes | 187.00 KiB/s, done.
Total 1 (delta 0), reused 0 (delta 0), pack-reused 0
remote: error: GH006: Protected branch update failed for refs/heads/backport-7621-to-2.13-maintenance.
remote: error: Changes must be made through a pull request. Required status check "installer_test" is expected.
To https://github.com/NixOS/nix.git
 ! [remote rejected]     backport-7621-to-2.13-maintenance -> backport-7621-to-2.13-maintenance (protected branch hook declined)
error: failed to push some refs to 'https://github.com/NixOS/nix.git'

Expected behavior

install_test triggers, runs, completes, and I can merge it.

nix-env --version output

Additional context

Priorities

Add 👍 to issues you find important.

@roberth
Copy link
Member Author

roberth commented Jan 18, 2023

@domenkozar Do you have an idea why installer_test might not report a status?

@zowoq
Copy link

zowoq commented Jan 18, 2023

A github action can't start another action unless it uses the non-default token.

Closing and reopening the PR is the simplest workaround.

@abathur
Copy link
Member

abathur commented Jan 18, 2023

If all of the checks need to run clean, you may be able to goose it by getting cachix set up for the installer tests. Edit: sorry. Wasn't thinking. This would just be for your fork. Doubt this matters for merge.

https://nixos.org/manual/nix/stable/contributing/hacking.html

Edit: though I feel like the expected status has something to do w/ perms

@thufschmitt
Copy link
Member

Yes, that's an issue with the backport bot (don't have a pointer handy, but it's a known issue, and not trivial to fix IIRC, something like what @zowoq mentions).

It's strange that the backport branch is protected though, I think I unstuck this a couple time by force-pushing to it 🤔

roberth added a commit to hercules-ci/nix that referenced this issue Jan 18, 2023
@edolstra
Copy link
Member

I've removed the requirement for the installer test to pass on maintenance branches.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging a pull request may close this issue.

5 participants