Skip to content
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
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,3 @@
# https://github.com/github/linguist/issues/1626#issuecomment-401442069
# this only affects the repo's language statistics
*.h linguist-language=C

.github/workflows/*.lock.yml linguist-generated=true merge=ours
8 changes: 4 additions & 4 deletions .github/policies/milestoneAssignment.prClosed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ configuration:
branch: main
then:
- addMilestone:
milestone: 13.3
milestone: 13.2
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
- if:
- payloadType: Pull_Request
- isAction:
action: Closed
- targetsBranch:
branch: release/13.2
branch: release/13.1
then:
- removeMilestone
- addMilestone:
milestone: 13.2
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/13.2 branch'
milestone: 13.1.1
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/13.1 branch'
193 changes: 0 additions & 193 deletions .github/skills/startup-perf/SKILL.md

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,26 +99,3 @@ When you comment on a PR (not an issue), the workflow will automatically push ch
### Concurrency

The workflow uses concurrency groups based on the issue/PR number to prevent race conditions when multiple commands are issued on the same issue.

## Backmerge Release Workflow

The `backmerge-release.yml` workflow automatically creates PRs to merge changes from `release/13.2` back into `main`.

### Schedule

Runs daily at 00:00 UTC (4pm PT during standard time, 5pm PT during daylight saving time). Can also be triggered manually via `workflow_dispatch`.

### Behavior

1. **Change Detection**: Checks if `release/13.2` has commits not in `main`
2. **PR Creation**: If changes exist, creates a PR to merge `release/13.2` → `main`
3. **Auto-merge**: Enables GitHub's auto-merge feature, so the PR merges automatically once approved
4. **Conflict Handling**: If merge conflicts occur, creates an issue instead of a PR

### Assignees

PRs and conflict issues are automatically assigned to @joperezr and @radical.

### Manual Trigger

To trigger manually, go to Actions → "Backmerge Release to Main" → "Run workflow".
Loading
Loading