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

Disable merge conflict detection on draft PRs #4966

Open
wants to merge 2 commits into
base: development
Choose a base branch
from

Conversation

PikachuEXE
Copy link
Collaborator

Pull Request Type

  • Bugfix
  • Feature Implementation
  • Documentation
  • Other

Related issue

Description

Keep getting notification about having merge conflicts and resolved on draft PRs is unnecessary IMO

Screenshots

Testing

Desktop

  • OS:
  • OS Version:
  • FreeTube version:

Additional context

@github-actions github-actions bot added the PR: waiting for review For PRs that are complete, tested, and ready for review label Apr 17, 2024
@FreeTubeBot FreeTubeBot enabled auto-merge (squash) April 17, 2024 00:56
@jasonhenriquez
Copy link
Collaborator

Seeing discussion on the checks not running if a PR is undrafted. How about this?

@PikachuEXE
Copy link
Collaborator Author

Updated

@jasonhenriquez
Copy link
Collaborator

Just realized the problem I linked was for something a bit different, so I don't know if that comment is relevant. I'm not familiar with this enough to know if it might have any weird side effects without testing first, so I'll just let others go on ahead

@PikachuEXE
Copy link
Collaborator Author

synchronize causes actions to run on PRs when base or current branch updated
ready_for_review causes actions to run on PRs when they are converted from draft to open (I am not sure if we even need this but anyway it's rare)

Don't think we need open and reopen

Copy link
Member

Choose a reason for hiding this comment

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

Maybe put the if statement before runs-on?
just like in 81c3588

@PikachuEXE
Copy link
Collaborator Author

Copy link
Member

Choose a reason for hiding this comment

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

Workflow skip doesnt work yet, tested in efb4f5ff-1298-471a-8973-3d47447115dc#62

@PikachuEXE
Copy link
Collaborator Author

@efb4f5ff-1298-471a-8973-3d47447115dc
I replace push with edited (action type of pull_request)
Which is triggered when The title or body of a pull request was edited, or the base branch of a pull request was changed.
https://docs.github.com/en/webhooks/webhook-events-and-payloads?actionType=edited#pull_request

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: waiting for review For PRs that are complete, tested, and ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants