Skip to content

Commit 2e1b495

Browse files
authored
chore(deps): consolidate dependency automation on Renovate + enable CI for merge queue (#765)
* ci: run CI on merge_group for merge queue support Add the merge_group trigger so the workflow executes on the temporary commits GitHub creates for the merge queue (gh-readonly-queue/**). Without it, the required status check never runs and the queue stalls. Disable cancel-in-progress for merge_group events: cancelling a run that is in the queue fails the group, so only cancel duplicate push/PR runs. * chore(deps): remove dependabot in favor of renovate Dependabot and Renovate were both opening PRs for the same dependencies (e.g. codecov-action #648/#740, @biomejs/biome #763/#701, vitest #587/#756). Keep Renovate only: it already groups ecosystem updates, schedules major reviews, and auto-merges safe patches. Delete the dependabot config and its auto-merge workflow (gated on dependabot[bot] actor), and reword the type:dependency label. * chore(deps): expand renovate grouping for real dependency map Group the remaining ecosystems by the actual dependencies in gradle/libs.versions.toml and the frontend package.json files: - Spring Framework & Security, Spring AI, Jackson (tools.jackson + 2.x compat), Reactor, backend testing libs, Gradle plugins - Vue UI/headless stack (reka-ui, shadcn-vue, vaul-vue, embla-carousel-vue, tanstack-vue-table, pragmatic-drag-and-drop, etc.) - Vite/Vitest tooling, TypeScript and @types, @vue/* and @vueuse/*, Astro icon sets, Playwright/axe coverage Drop the stale matchFileNames from Vue Core and Astro so grouping applies across app, admin and marketing, and add groups that were missing entirely.
1 parent 85464db commit 2e1b495

5 files changed

Lines changed: 127 additions & 316 deletions

File tree

.github/dependabot.yml

Lines changed: 0 additions & 203 deletions
This file was deleted.

.github/labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
- name: "type:dependency"
3030
color: "e3e3e3"
31-
description: "Dependency updates (Dependabot or manual)"
31+
description: "Dependency updates (Renovate or manual)"
3232

3333
- name: "type:security"
3434
color: "d93f0b"

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ on:
55
branches: [main, develop]
66
pull_request:
77
branches: [main, develop]
8+
merge_group:
9+
branches: [main]
810

911
concurrency:
10-
group: ci-${{ github.ref }}
11-
cancel-in-progress: true
12+
group: ci-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
13+
cancel-in-progress: ${{ github.event_name != 'merge_group' }}
1214

1315
permissions:
1416
contents: read

.github/workflows/dependency-auto-merge.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)