Added ouputs so message can be sent on discord if conflict found - #49
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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