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

Release 3.0.2 #129

Merged
merged 2 commits into from
Jan 23, 2024
Merged

Release 3.0.2 #129

merged 2 commits into from
Jan 23, 2024

Conversation

mauritsvanrees
Copy link
Member

I have released 3.0.2 on PyPI, but am not allowed to push directly to master:

ERROR: exit code 1.
remote: error: GH006: Protected branch update failed for refs/heads/master.
remote: error: 3 of 3 required status checks are expected.
To github.com:zopefoundation/Products.GenericSetup.git
! [remote rejected] master -> master (protected branch hook declined)
error: failed to push some refs to 'github.com:zopefoundation/Products.GenericSetup.git'

@icemac
Copy link
Member

icemac commented Jan 23, 2024

Hi @mauritsvanrees,

here I added you to "Restrict who can push to matching branches" on master, please try if this allows you to push your changes to master.

@mauritsvanrees
Copy link
Member Author

No, same error:

$ git push
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: error: GH006: Protected branch update failed for refs/heads/master.
remote: error: 3 of 3 required status checks are expected.
To github.com:zopefoundation/Products.GenericSetup.git
 ! [remote rejected] master -> master (protected branch hook declined)
error: failed to push some refs to 'github.com:zopefoundation/Products.GenericSetup.git'

@mauritsvanrees mauritsvanrees merged commit 481ed55 into master Jan 23, 2024
12 checks passed
@mauritsvanrees mauritsvanrees deleted the maurits-release-302 branch January 23, 2024 09:26
@mauritsvanrees
Copy link
Member Author

mauritsvanrees commented Jan 23, 2024

Hey, that is weird. I saw the tests were passing in this PR. Then I went to the terminal, and did the following:

$ git co master
$ git reset --hard maurits-release-302
$ git push

and it worked! PR is automatically marked as being merged.

I guess that is a workaround: create a PR, get the status checks green, and then I can push those same commits directly to master. Not a very useful workaround of course...

See also comments on zopefoundation/Products.PluggableAuthService#118 where @icemac and @dataflake tried fixing the branch protection rules.

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

Successfully merging this pull request may close these issues.

None yet

2 participants