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.

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

Jump to bottom

Adding Validate Pull Request GitHub Actions workflow to check PRs for merge conflicts (Lombiq Technologies: OCORE-141) #15114

Merged
merged 4 commits into from
Jan 29, 2024
Merged

Adding Validate Pull Request GitHub Actions workflow to check PRs for merge conflicts (Lombiq Technologies: OCORE-141) #15114

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3506459
Adding Validate Pull Request GitHub Actions workflow to check PRs for…
Piedone Jan 17, 2024
a89e38c
End of file newline
Piedone Jan 17, 2024
430d86f
Let's run it always on the latest Ubuntu
Piedone Jan 17, 2024
b0de027
Merge branch 'main' into zl/pr-validation
Piedone Jan 18, 2024
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/validate_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Validate Pull Request

on:
push:
pull_request_target:
types: [opened, synchronize]

jobs:
validate-pull-request:
name: Validate Pull Request
runs-on: ubuntu-latest
timeout-minutes: 3
steps:
- name: Check for Merge Conflict in PR
# releases/2.1.0
uses: eps1lon/actions-label-merge-conflict@92924ba33a60e436034b0ac3838de523bf7df071
with:
repoToken: ${{ secrets.GITHUB_TOKEN }}
commentOnDirty: "This pull request has merge conflicts. Please resolve those before requesting a review."
dirtyLabel: "merge conflict"
# The default 120 is too long. The mergeable state is usually calculated by GitHub within seconds.
retryAfter: 5