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

chore: test external push to protected branch #52

Merged
merged 1 commit into from
Oct 10, 2024

Conversation

ARR4N
Copy link
Collaborator

@ARR4N ARR4N commented Oct 10, 2024

Important

Please DO NOT merge this via the GitHub UI!

Why this should be merged

Pushing this commit to the libevm branch fails (by design) because of branch protection requiring a PR. I want to test what happens if, once the PR is approved and all status checks pass, I locally git merge --ff-only on the libevm branch before pushing to GitHub. Will it recognise and honour the PR?

Without this, the GitHub PR merge uses --no-ff, which isn't always desirable as it introduces an extra merge commit when fast-forwarding was possible.

How this works

Empty commit that is a fast forward of the libevm branch.

How this was tested

n/a

Pushing this commit to the `libevm` branch fails (by design) because of branch protection requiring a PR. I want to test what happens if, once the PR is approved and all status checks pass, I _locally_ `git merge --ff-only` on the `libevm` branch before pushing to GitHub. Will it recognise and honour the PR?

Without this, the GitHub PR merge uses `--no-ff`, which isn't always desirable.
@ARR4N ARR4N force-pushed the arr4n/github-fast-forward-experiment branch from 8f05c53 to 18d6153 Compare October 10, 2024 12:04
@ARR4N
Copy link
Collaborator Author

ARR4N commented Oct 10, 2024

This looks promising. I tried to push with CI running:

remote: error: GH013: Repository rule violations found for refs/heads/libevm.
remote: Review all repository rules at http://github.com/ava-labs/go-ethereum/rules?ref=refs%2Fheads%2Flibevm
remote: 
remote: - At least 1 approving review is required by reviewers with write access.
remote: 
remote: - Required status check "go_test_short" is in progress.
remote: 
To github.com:ava-labs/go-ethereum.git

And once it finished:

remote: error: GH013: Repository rule violations found for refs/heads/libevm.
remote: Review all repository rules at http://github.com/ava-labs/go-ethereum/rules?ref=refs%2Fheads%2Flibevm
remote: 
remote: - At least 1 approving review is required by reviewers with write access.
remote: 
To github.com:ava-labs/go-ethereum.git

@ARR4N ARR4N merged commit 18d6153 into libevm Oct 10, 2024
3 checks passed
@ARR4N ARR4N deleted the arr4n/github-fast-forward-experiment branch October 10, 2024 13:37
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.

2 participants