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

Tag Version (this repo) fails due to branch protection rules (OSOE-912) #396

Closed
BenedekFarkas opened this issue Oct 31, 2024 · 1 comment · Fixed by #397
Closed

Tag Version (this repo) fails due to branch protection rules (OSOE-912) #396

BenedekFarkas opened this issue Oct 31, 2024 · 1 comment · Fixed by #397
Assignees
Labels
bug Something isn't working good first issue Good for newcomers

Comments

@BenedekFarkas
Copy link
Member

BenedekFarkas commented Oct 31, 2024

The last step named Commit and Push Merge Target Changes fails, because the dev branch is protected.

remote: error: GH006: Protected branch update failed for refs/heads/dev.        
remote: 
remote: - Changes must be made through the merge queue        
remote: 
remote: - Required status check "validate-gha-refs" is expected.        
To https://github.com/Lombiq/GitHub-Actions
 ! [remote rejected] dev -> dev (protected branch hook declined)
error: failed to push some refs to 'https://github.com/Lombiq/GitHub-Actions'
Error: Invalid status code: 1
  1. Make the last two steps in the tag-version workflow skippable by configuration.
  2. Add instructions to the readme on how to resolve it:
    • As an elevated user (with push access to dev):
      • Start a merge from the release branch to dev, but don't create a commit.
      • Revert all the file changes.
      • Merge the empty commit.
    • Otherwise:
      • Create a commit on the release branch that reverts all the file the changes (compared to dev).
      • Create a PR for the release branch and merge it.

Jira issue

@BenedekFarkas BenedekFarkas added the good first issue Good for newcomers label Oct 31, 2024
@github-actions github-actions bot changed the title Tag Version (this repo) fails due to branch protection rules Tag Version (this repo) fails due to branch protection rules (OSOE-912) Oct 31, 2024
@Piedone Piedone added the bug Something isn't working label Oct 31, 2024
@Piedone
Copy link
Member

Piedone commented Oct 31, 2024

We can change the branch protection rule or something to allow just these. I think I have a solution, will follow up.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working good first issue Good for newcomers
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants