Skip to content

Conversation

@WisdomNwaiwu
Copy link
Contributor

Context

This improves the auto-update mechanism used across all frontend and backend repositories. Previously, the workflow could detect merge conflicts but did not expose this information to calling workflows in a structured way, making it impossible to trigger conflict-specific CI logic or Discord notifications.

Description

A new output structure was added to the auto-update-pr reusable workflow to report whether an auto-update attempt resulted in a merge conflict and whether it succeeded or failed. These outputs (auto_update_conflict and auto_update_status) can now be consumed by the parent workflows to display accurate Discord notifications and handle conflict scenarios more gracefully.

Changes in the codebase (optional)

Added auto_update_conflict and auto_update_status as workflow_call outputs.
Added logic to set status=success|failure depending on merge outcome.
Ensured a default conflict output is generated for up-to-date branches.
Updated merge-check step to expose conflict status consistently.

Additional information (optional)

This enables the CI to send clear Discord messages when auto-update fails due to conflicts and improves visibility for developers.

Links

  • ClickUp:
  • Additional:

@WisdomNwaiwu WisdomNwaiwu merged commit f6ed5d7 into main Dec 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants