Skip to content
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.

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

feat: add workflow to verify conflicts #2

Merged
merged 1 commit into from
Feb 21, 2024
Merged
Changes from all commits
Commits
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
39 changes: 39 additions & 0 deletions .github/workflows/verify_conflicts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Check for conflicts

on:
pull_request:
branches:
- main

jobs:
check-conflicts:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Check for conflicts
id: check
run: |
git fetch origin
git merge-base --is-ancestor HEAD FETCH_HEAD || echo "conflict=true" >> $GITHUB_ENV

- name: Add conflict tag
if: env.conflict == 'true'
uses: actions/github-script@v4
with:
script: |
github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
body: 'This pull request has conflicts. Please resolve them before merging.'
});
github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
labels: ['conflict']
});
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Loading