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

chore: bring back label, merge conflict detection action #31

Merged
merged 4 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
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
29 changes: 29 additions & 0 deletions .github/workflows/conflicts.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Rebase Conflicts

on:
push:
branches:
- master
pull_request:
types: [synchronize]

permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
conflicts:
name: Check for Conflicts
runs-on: ubuntu-latest
steps:
- name: Label PRs
uses: ExodusMovement/actions-label-merge-conflict@71abef2871620db9447045b06bcd150ed607dc13
with:
dirtyLabel: 'blocked/needs-rebase'
repoToken: '${{ secrets.GITHUB_TOKEN }}'
commentOnDirty: 'Houston, this is Conflict Bot. We have a conflict. I repeat, we have a conflict. @<%= author %> please rebase. Acknowledge.'
retryAfter: 45
removeDirtyComment: true
22 changes: 22 additions & 0 deletions .github/workflows/label.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Label

on:
pull_request:

permissions:
contents: read

jobs:
label:
name: PR
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Package Names
uses: ExodusMovement/lerna-package-name-action@8ab1e30ccb854ba24499b15ec0b7def7c9c12bf2
with:
github-token: '${{ secrets.GITHUB_TOKEN }}'
- name: Categories
uses: actions/labeler@v4
Loading