File tree Expand file tree Collapse file tree 2 files changed +23
-16
lines changed Expand file tree Collapse file tree 2 files changed +23
-16
lines changed Original file line number Diff line number Diff line change 7272 "dockerfile" ,
7373 "rpm-lockfile" ,
7474 ] ,
75- "packageRules" : [ {
76- "matchPackageNames" : [ "*" ] ,
77- "groupName" : "All updates" ,
78- "automerge" : true ,
79- // A known issue is that some non-Konflux CI jobs currently fail, which may prevent successful auto-merging with a "branch" auto-merge setting.
80- // Therefore, we use PR merge type and have automation approve PRs.
81- "automergeType" : "pr" ,
82- "automergeStrategy" : "squash" ,
83- // Tell Renovate that it can automerge branches at any time of the day.
84- "automergeSchedule" : [
85- "at any time"
86- ] ,
87- } ] ,
88- "labels" : [ "auto-approve" ] ,
75+ "packageRules" : [
76+ {
77+ "matchPackageNames" : [
78+ "*" ,
79+ ] ,
80+ "groupName" : "All updates" ,
81+ "automerge" : true ,
82+ // A known issue is that some non-Konflux CI jobs currently fail, which may prevent successful auto-merging with a "branch" auto-merge setting.
83+ // Therefore, we use PR merge type and have automation approve PRs.
84+ "automergeType" : "pr" ,
85+ "automergeStrategy" : "squash" ,
86+ // Tell Renovate that it can automerge branches at any time of the day.
87+ "automergeSchedule" : [
88+ "at any time" ,
89+ ] ,
90+ }
91+ ] ,
92+ "labels" : [
93+ // Add auto-approve label which triggers the corresponding workflow.
94+ "auto-approve" ,
95+ ] ,
8996}
Original file line number Diff line number Diff line change 77
88jobs :
99 auto-approve :
10- name : Auto-approve Konflux updates
10+ name : Auto-approve Konflux updates for default branch
1111 runs-on : ubuntu-latest
12- if : github.actor == 'red-hat-konflux[bot]' && github.event.label.name == 'auto-approve'
12+ if : github.actor == 'red-hat-konflux[bot]' && github.event.label.name == 'auto-approve' && github.event.pull_request.base.ref == github.event.pull_request.base.repo.default_branch
1313 steps :
1414 - env :
1515 GH_TOKEN : ${{ secrets.RHACS_BOT_GITHUB_TOKEN }}
You can’t perform that action at this time.
0 commit comments