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

ci(conflicts): create conflicts.yml workflow #7104

Merged

Conversation

davorpa
Copy link
Member

@davorpa davorpa commented Sep 23, 2022

What does this PR do?

Improve repo

For resources

Description

The conflicts tag is commonly used to mark those PR that have merge conflicts / dirty status with the base branch. But this was a manually process.

Well, as part of enhacements requested in #7024 this workflow/pipeline automates that process using a GitHub Action, eps1lon/actions-label-merge-conflict, with which we...

  • automanages the conflicts label
  • post a message when conflicts are arisen.
    image
  • A summary report is composed on the fly with the mergeability results.
    image

Workflow could be raised:

  • manually (all PRs are checked. Useful as start up / for stucks)
  • on push (all PR with linked base commit are checked)
  • on pull request synchronize (current PR is checked)

Tests:

Checklist:

Follow-up

  • Check the status of GitHub Actions and resolve any reported warnings!

@davorpa davorpa added New Feature New feature / enhancement / translation... 👀 Needs Review Is this really a good resource? Reviews requested. 🤖 automation Automated tasks done by workflows or bots labels Sep 23, 2022
@davorpa davorpa self-assigned this Sep 23, 2022
@eshellman
Copy link
Collaborator

I'm nervous about adding this so soon before October, even though it would be particularly useful before then.

@davorpa
Copy link
Member Author

davorpa commented Sep 24, 2022

I'm nervous about adding this so soon before October, even though it would be particularly useful before then.

If it serve... is used by Jenkins (https://github.com/jenkinsci/jenkins/blob/master/.github/workflows/label-conflicting-pr.yml). I only add the GHA summary to report what happens in each run.

Of course, workflows can be disabled without revert code.

image

You decide.

@eshellman Could you review the comment text? Remove parameter is also possible

Copy link
Member

@LuigiImVector LuigiImVector left a comment

Choose a reason for hiding this comment

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

LGTM

@eshellman
Copy link
Collaborator

Commenting looks good. Jenkins doesn't get the volume of PRs that we do during October.

The 'you' after 'advance' and before 'for' should not be there.

Co-authored-by: Biswadeep Purkayastha <[email protected]>
@eshellman eshellman merged commit 0e75c6d into EbookFoundation:main Oct 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🤖 automation Automated tasks done by workflows or bots 👀 Needs Review Is this really a good resource? Reviews requested. New Feature New feature / enhancement / translation...
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants