Skip to content
Closed
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
23 changes: 23 additions & 0 deletions .github/workflows/grove-conflicts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Grove Conflict Check

on:
pull_request:
types: [opened, synchronize, reopened]

permissions:
contents: read
pull-requests: write

jobs:
analyze:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: NathanDrake2406/grove/action@feat-github-action
with:
grove-version: "v0.4.0-rc.1"
base-branch: main
comment-on-clean: "true"
11 changes: 7 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ members = [
]

[workspace.package]
version = "0.3.1"
version = "0.4.0"
edition = "2024"
license = "MIT OR Apache-2.0"
repository = "https://github.com/NathanDrake2406/grove"
Expand Down
1 change: 1 addition & 0 deletions action/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/
35 changes: 35 additions & 0 deletions action/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: "Grove PR Conflict Checker"
description: "Cross-PR conflict intelligence — detects symbol-level and dependency-level collisions between open pull requests"
author: "NathanDrake2406"

branding:
icon: "git-merge"
color: "green"

inputs:
github-token:
description: "GitHub token for API access"
default: "${{ github.token }}"
required: true
base-branch:
description: "Base branch to analyze against"
default: "main"
disable-layers:
description: "Comma-separated layers to disable (e.g. 'dependency,schema')"
default: ""
comment-on-clean:
description: "Post a comment when no conflicts are found"
default: "false"
grove-version:
description: "Grove version to install (tag from GitHub Releases, e.g. 'v0.4.0')"
default: "latest"
max-branches:
description: "Maximum number of PR branches to analyze (most recently updated first)"
default: "50"
timeout:
description: "Per-pair analysis timeout in seconds"
default: "30"

runs:
using: "node20"
main: "dist/index.js"
Loading
Loading