Skip to content

Add job to update open PRs with S-Merge-Conflicts - #25508

Open
Zeophlite wants to merge 5 commits into
bevyengine:mainfrom
Zeophlite:label-merge-conflicts
Open

Add job to update open PRs with S-Merge-Conflicts#25508
Zeophlite wants to merge 5 commits into
bevyengine:mainfrom
Zeophlite:label-merge-conflicts

Conversation

@Zeophlite

@Zeophlite Zeophlite commented Aug 22, 2026

Copy link
Copy Markdown
Contributor

Objective

Solution

  • Add a daily action to run the script

Testing

  • Ran script locally, not sure if anything specific is required to work in

@Zeophlite Zeophlite added D-Straightforward Simple bug fixes and API improvements, docs, test and examples S-Needs-Review Needs reviewer attention (from anyone!) to move forward labels Aug 22, 2026
Comment thread .github/workflows/update-labels.yml Fixed
Comment thread .github/workflows/update-labels.yml Fixed
Comment thread .github/workflows/update-labels.yml Fixed
@Zeophlite Zeophlite added the A-Build-System Related to build systems or continuous integration label Aug 22, 2026
@github-actions

Copy link
Copy Markdown
Contributor

You added a new example but didn't add metadata for it. Please update the root Cargo.toml file.

@Zeophlite

Copy link
Copy Markdown
Contributor Author

I presume the security tab has suggestions for the above issues

Comment thread .github/workflows/update-labels.yml Fixed
@github-actions

Copy link
Copy Markdown
Contributor

You added a new example but didn't add metadata for it. Please update the root Cargo.toml file.

Comment thread .github/tools/label-merge-conflicts.sh Outdated

echo "Checking PRs with S-Merge-Conflicts if they are mergeable"

gh pr list --repo bevyengine/bevy --json number,mergeable,title --label S-Merge-Conflicts -L 10000 > yes_conflict_label.json

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

10000 is a lie, it's limited at 1000
cli/cli#3836

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

That is annoying :(

@mockersf

Copy link
Copy Markdown
Member

I'm not sure this would work unless there are no pr merged to main between two runs
the conflict state is computed lazily, unknown by default

  • run, no status, but triggers its computation
  • something is merged to main, all status are cleared in GitHub cache
  • next day, run, no status, but triggers its computation

@Zeophlite

Copy link
Copy Markdown
Contributor Author

I'm not sure this would work unless there are no pr merged to main between two runs the conflict state is computed lazily, unknown by default

* run, no status, but triggers its computation

* something is merged to main, all status are cleared in GitHub cache

* next day, run, no status, but triggers its computation

Ah right, the workflow's meant to run the script twice if needed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-Build-System Related to build systems or continuous integration D-Straightforward Simple bug fixes and API improvements, docs, test and examples S-Needs-Review Needs reviewer attention (from anyone!) to move forward

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add a bot to label / unlabel PRs with merge conflicts

3 participants