Skip to content

ci: [WPN-7] Auto label for conflict PRs in CI/CD #14

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
draphy merged 2 commits into from
Apr 18, 2025
Merged

ci: [WPN-7] Auto label for conflict PRs in CI/CD #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c686664
ci: [WPN-7] Auto label for conflict PRs in CI/CD
draphy Apr 18, 2025
6e1eb9d
test: This is a test
draphy Apr 18, 2025
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
14 changes: 14 additions & 0 deletions .github/workflows/verify-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,17 @@ jobs:
else
echo "✅ PR title format is valid!"
fi

label-merge-conflicts:
name: Has Conflicts
runs-on: ubuntu-latest
steps:
- name: Check for Merge Conflicts
uses: prince-chrismc/label-merge-conflicts-action@v3
with:
conflict_label_name: "conflicts"
github_token: ${{ secrets.GITHUB_TOKEN }}
conflict_comment: |
:wave: Hi, @${{ github.actor }},
I detected conflicts against the base branch :speak_no_evil:
You'll want to sync :arrows_counterclockwise: your branch with upstream!
1 change: 1 addition & 0 deletions packages/web-push/lib/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// This is the main page