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

workflows/sponsors-maintainers-man-completions: fix git-try-push failure #15180

Merged
merged 1 commit into from Apr 10, 2023

Conversation

ZhongRuoyu
Copy link
Member

@ZhongRuoyu ZhongRuoyu commented Apr 9, 2023

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same change?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes? Here's an example.
  • Have you successfully run brew style with your changes locally?
  • Have you successfully run brew typecheck with your changes locally?
  • Have you successfully run brew tests with your changes locally?

I think this should actually fix the failure seen in https://github.com/Homebrew/brew/actions/runs/4651602426/jobs/8231313421. origin_branch falls back to branch. This means that the git-try-push step will now push to and rebase on the same remote branch. (Previously, it rebased on master, not the branch to push to.)

Note that this also means the branch ${{ steps.update.outputs.branch }} (sponsors-maintainers-man-completions or PR branch) will not be rebased onto origin/master.

Copy link

@rlane2126 rlane2126 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good

Copy link
Member

@MikeMcQuaid MikeMcQuaid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, thanks again @ZhongRuoyu!

@MikeMcQuaid MikeMcQuaid merged commit 0a23ee2 into Homebrew:master Apr 10, 2023
24 checks passed
@ZhongRuoyu ZhongRuoyu deleted the sponsors-git-try-push branch April 10, 2023 12:22
@github-actions github-actions bot added the outdated PR was locked due to age label May 11, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
outdated PR was locked due to age
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants