Merge pull request #58 from nowsprinting/chore/conflibot

Add conflibot workflow

.github/workflows/actionlint.yml

@@ -14,6 +14,12 @@ on:
     paths:
       - .github/workflows/**
 
+permissions: {}
+
+defaults:
+  run:
+    shell: bash
+
 jobs:
   actionlint:
     runs-on: ubuntu-latest

.github/workflows/conflibot.yml

@@ -0,0 +1,31 @@
+name: Check pull requests for conflicts
+
+on:
+  pull_request_target:
+    types: [ opened, synchronize, reopened ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions: {}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  conflibot:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    permissions:
+      contents: read
+      pull-requests: read
+      checks: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: wktk/conflibot@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          exclude: ""

.github/workflows/create-release-pr.yml

@@ -7,6 +7,12 @@ name: Create release pull request
 on:
   workflow_dispatch:
 
+permissions: {}
+
+defaults:
+  run:
+    shell: bash
+
 jobs:
   create-release-pr:
     runs-on: ubuntu-latest

.github/workflows/metacheck.yml

@@ -10,6 +10,12 @@ on:
   pull_request:
     types: [ opened, synchronize, reopened ]  # Same as default
 
+permissions: {}
+
+defaults:
+  run:
+    shell: bash
+
 jobs:
   meta-check:
     runs-on: ubuntu-latest

.github/workflows/pr-labeler.yml

@@ -7,6 +7,12 @@ on:
   pull_request:
     types: [ opened ]
 
+permissions: {}
+
+defaults:
+  run:
+    shell: bash
+
 jobs:
   pr-labeler:
     if: github.event.pull_request.head.repo.fork == false # Skip on public fork

.github/workflows/release-drafter.yml

@@ -13,6 +13,12 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions: {}
+
+defaults:
+  run:
+    shell: bash
+
 jobs:
   release-drafter:
     if: github.repository_owner == 'nowsprinting' # Skip on forked repo

.github/workflows/release.yml

@@ -10,6 +10,12 @@ on:
     paths:
       - package.json
 
+permissions: {}
+
+defaults:
+  run:
+    shell: bash
+
 jobs:
   check-bump-version:
     if: github.repository_owner == 'nowsprinting' # Skip on forked repo

.github/workflows/test.yml

@@ -22,6 +22,12 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions: {}
+
+defaults:
+  run:
+    shell: bash
+
 jobs:
   test:
     if: github.event.pull_request.head.repo.fork == false # Skip on public fork, because can not read secrets.