Skip to content

Commit 9af3b21

Browse files
authored
update main references (#1112)
1 parent 7ee0911 commit 9af3b21

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.ci/jobs/fleet-server.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
discover-pr-forks-trust: permission
1414
discover-pr-origin: merge-current
1515
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+)'
1717
notification-context: 'fleet-server'
1818
repo: fleet-server
1919
repo-owner: elastic

.mergify.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pull_request_rules:
3737
- name: backport patches to 8.0 branch
3838
conditions:
3939
- merged
40-
- base=master
40+
- base=main
4141
- label=backport-v8.0.0
4242
actions:
4343
backport:
@@ -65,7 +65,7 @@ pull_request_rules:
6565
- name: backport patches to 7.17 branch
6666
conditions:
6767
- merged
68-
- base=master
68+
- base=main
6969
- label=backport-v7.17.0
7070
actions:
7171
backport:
@@ -79,7 +79,7 @@ pull_request_rules:
7979
- name: backport patches to 7.16 branch
8080
conditions:
8181
- merged
82-
- base=master
82+
- base=main
8383
- label=backport-v7.16.0
8484
actions:
8585
backport:
@@ -93,7 +93,7 @@ pull_request_rules:
9393
- name: backport patches to 7.15 branch
9494
conditions:
9595
- merged
96-
- base=master
96+
- base=main
9797
- label=backport-v7.15.0
9898
actions:
9999
backport:
@@ -107,7 +107,7 @@ pull_request_rules:
107107
- name: notify the backport policy
108108
conditions:
109109
- -label~=^backport
110-
- base=master
110+
- base=main
111111
actions:
112112
comment:
113113
message: |

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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/)
22

33
# Fleet Server implementation
44

dev-tools/cherrypick_pr

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def main():
5757
help="Assume yes. Warning: discards local changes.")
5858
parser.add_argument("--continue", action="store_true",
5959
help="Continue after fixing merging errors.")
60-
parser.add_argument("--from_branch", default="master",
60+
parser.add_argument("--from_branch", default="main",
6161
help="From branch")
6262
parser.add_argument("--create_pr", action="store_true",
6363
help="Create a PR using the Github API " +

0 commit comments

Comments
 (0)