File tree 4 files changed +8
-8
lines changed
4 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 13
13
discover-pr-forks-trust : permission
14
14
discover-pr-origin : merge-current
15
15
discover-tags : true
16
- head-filter-regex : ' (master |7\.x|7\.1\d|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
16
+ head-filter-regex : ' (main |7\.x|7\.1\d|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
17
17
notification-context : ' fleet-server'
18
18
repo : fleet-server
19
19
repo-owner : elastic
Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ pull_request_rules:
37
37
- name : backport patches to 8.0 branch
38
38
conditions :
39
39
- merged
40
- - base=master
40
+ - base=main
41
41
- label=backport-v8.0.0
42
42
actions :
43
43
backport :
@@ -65,7 +65,7 @@ pull_request_rules:
65
65
- name : backport patches to 7.17 branch
66
66
conditions :
67
67
- merged
68
- - base=master
68
+ - base=main
69
69
- label=backport-v7.17.0
70
70
actions :
71
71
backport :
@@ -79,7 +79,7 @@ pull_request_rules:
79
79
- name : backport patches to 7.16 branch
80
80
conditions :
81
81
- merged
82
- - base=master
82
+ - base=main
83
83
- label=backport-v7.16.0
84
84
actions :
85
85
backport :
@@ -93,7 +93,7 @@ pull_request_rules:
93
93
- name : backport patches to 7.15 branch
94
94
conditions :
95
95
- merged
96
- - base=master
96
+ - base=main
97
97
- label=backport-v7.15.0
98
98
actions :
99
99
backport :
@@ -107,7 +107,7 @@ pull_request_rules:
107
107
- name : notify the backport policy
108
108
conditions :
109
109
- -label~=^backport
110
- - base=master
110
+ - base=main
111
111
actions :
112
112
comment :
113
113
message : |
Original file line number Diff line number Diff line change 1
- [ ![ Build Status] ( https://beats-ci.elastic.co/job/Ingest-manager/job/fleet-server/job/master /badge/icon )] ( https://beats-ci.elastic.co/job/Ingest-manager/job/fleet-server/job/master / )
1
+ [ ![ Build Status] ( https://beats-ci.elastic.co/job/Ingest-manager/job/fleet-server/job/main /badge/icon )] ( https://beats-ci.elastic.co/job/Ingest-manager/job/fleet-server/job/main / )
2
2
3
3
# Fleet Server implementation
4
4
Original file line number Diff line number Diff line change @@ -57,7 +57,7 @@ def main():
57
57
help = "Assume yes. Warning: discards local changes." )
58
58
parser .add_argument ("--continue" , action = "store_true" ,
59
59
help = "Continue after fixing merging errors." )
60
- parser .add_argument ("--from_branch" , default = "master " ,
60
+ parser .add_argument ("--from_branch" , default = "main " ,
61
61
help = "From branch" )
62
62
parser .add_argument ("--create_pr" , action = "store_true" ,
63
63
help = "Create a PR using the Github API " +
You can’t perform that action at this time.
0 commit comments