Skip to content

Commit 549ce9d

Browse files
authored
Merge branch 'main' into dependabot/docker/golang-1.26
2 parents 9b2cee9 + 1ab5f82 commit 549ce9d

3 files changed

Lines changed: 4 additions & 18 deletions

File tree

.github/dependabot.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ updates:
66
schedule:
77
interval: "daily"
88
open-pull-requests-limit: 10
9-
labels:
10-
- "dependencies"
11-
- "go"
129
commit-message:
13-
prefix: "chore(deps)"
10+
prefix: "chore"
1411
include: "scope"
1512
groups:
1613
kubernetes:
@@ -25,11 +22,8 @@ updates:
2522
interval: "weekly"
2623
day: "monday"
2724
time: "06:00"
28-
labels:
29-
- "dependencies"
30-
- "github-actions"
3125
commit-message:
32-
prefix: "chore(github-actions)"
26+
prefix: "chore github-actions"
3327
include: "scope"
3428
groups:
3529
github-actions:
@@ -41,9 +35,6 @@ updates:
4135
directory: "/"
4236
schedule:
4337
interval: "daily"
44-
labels:
45-
- "dependencies"
46-
- "docker"
4738
commit-message:
48-
prefix: "chore(docker)"
39+
prefix: "chore docker"
4940
include: "scope"

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ jobs:
1616
with:
1717
github-token: "${{ secrets.GITHUB_TOKEN }}"
1818

19-
- name: Auto-approve PR
20-
run: gh pr review --approve "$PR_URL"
21-
env:
22-
PR_URL: ${{ github.event.pull_request.html_url }}
23-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24-
2519
- name: Enable auto-merge for minor and patch updates
2620
if: |
2721
steps.metadata.outputs.update-type == 'version-update:semver-minor' ||

.github/workflows/verify-codegen.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Verify
33
on:
44
pull_request:
55
workflow_dispatch:
6+
merge_group:
67

78
jobs:
89
verify:

0 commit comments

Comments
 (0)