Skip to content

Added ouputs so message can be sent on discord if conflict found #49

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.

Sign up for GitHub

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

Merged
WisdomNwaiwu merged 1 commit into from
Dec 10, 2025
Merged

Added ouputs so message can be sent on discord if conflict found #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/workflows/auto-update-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,19 @@ on:
pr_head:
required: false
type: string
outputs:
auto_update_conflict:
value: ${{ jobs.auto_update.outputs.auto_update_conflict }}
auto_update_status:
value: ${{ jobs.auto_update.outputs.auto_update_status }}

jobs:
auto_update:
name: Auto-update PR if behind
runs-on: ubuntu-latest
outputs:
auto_update_conflict: ${{ steps.mergecheck.outputs.conflict }}
auto_update_status: ${{ steps.status.outputs.status }}
steps:
- name: Checkout repo
uses: actions/checkout@v6
Expand Down Expand Up @@ -58,6 +66,11 @@ jobs:
if: steps.behind.outputs.behind == '0'
run: echo "Branch is up to date."

- name: Default conflict output when up to date
id: mergecheck
if: steps.behind.outputs.behind == '0'
run: echo "conflict=false" >> $GITHUB_OUTPUT

- name: Try merge (check conflicts)
id: mergecheck
if: steps.behind.outputs.behind != '0'
Expand All @@ -81,6 +94,15 @@ jobs:
if: ${{ steps.mergecheck.outputs.conflict == 'true' }}
run: echo "Merge conflict detected — cannot auto-update."

- name: Set auto-update status
id: status
run: |
if [ "${{ steps.mergecheck.outputs.conflict }}" == "true" ]; then
echo "status=failure" >> $GITHUB_OUTPUT
else
echo "status=success" >> $GITHUB_OUTPUT
fi

- name: Commit and push merge
if: ${{ steps.mergecheck.outputs.conflict == 'false' }}
run: |
Expand Down