Skip to content

Commit 45d96f1

Browse files
authored
Merge branch 'main' into smoke_test
2 parents 9b99673 + f0d2054 commit 45d96f1

File tree

13 files changed

+2822
-1207
lines changed

13 files changed

+2822
-1207
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
version: 2
22
updates:
3-
# Monitor root Go module
43
- package-ecosystem: "gomod"
54
directory: "/"
65
schedule:
@@ -9,8 +8,11 @@ updates:
98
prefix: "chore"
109
prefix-development: "chore"
1110
include: "scope"
11+
labels:
12+
- "dependencies"
13+
- "go"
14+
- "auto-merge"
1215

13-
# Monitor e2e-tests tools Go module
1416
- package-ecosystem: "gomod"
1517
directory: "/e2e-tests/tools"
1618
schedule:
@@ -19,3 +21,6 @@ updates:
1921
prefix: "chore"
2022
prefix-development: "chore"
2123
include: "scope"
24+
labels:
25+
- "dependencies"
26+
- "go"

.github/renovate.json5

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,20 @@
2828
// - gomod: intentionally omitted (handled by Dependabot)
2929
// - tekton: keeps Konflux pipeline tasks up-to-date (MintMaker-specific knowledge, Dependabot cannot do this)
3030
"dockerfile",
31+
"rpm-lockfile",
3132
"tekton",
3233
],
3334
"dockerfile": {
3435
"includePaths": [
3536
"konflux.Dockerfile",
3637
],
3738
},
39+
"rpm-lockfile": {
40+
"schedule": [
41+
// Duplicate the schedule here because Konflux global config may have a special override for rpm-lockfile.
42+
"* 3-7 * * *",
43+
],
44+
},
3845
"tekton": {
3946
"schedule": [
4047
// Duplicate the schedule here because Konflux global config may have a special override for tekton.

.github/workflows/auto-merge.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Dependabot auto-merge
2+
on: pull_request
3+
4+
permissions:
5+
contents: write
6+
pull-requests: write
7+
8+
jobs:
9+
dependabot:
10+
runs-on: ubuntu-latest
11+
if: |
12+
github.event.pull_request.user.login == 'dependabot[bot]' &&
13+
contains(github.event.pull_request.labels.*.name, 'auto-merge')
14+
steps:
15+
- name: Enable auto-merge for Dependabot PRs
16+
run: gh pr merge --auto --squash "$PR_URL" && gh pr review --approve "$PR_URL"
17+
env:
18+
PR_URL: ${{github.event.pull_request.html_url}}
19+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

0 commit comments

Comments
 (0)