Skip to content

Commit 71e5613

Browse files
committed
Repository: rename master branch to main
1 parent 57d659d commit 71e5613

8 files changed

+14
-14
lines changed

.ci/jobs/defaults.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
parameters:
1616
- string:
1717
name: branch_specifier
18-
default: refs/heads/master
18+
default: refs/heads/main
1919
description: the Git branch specifier to build (<branchName>, <tagName>,
2020
<commitId>, etc.)
2121
properties:

.ci/jobs/elastic+go-elasticsearch+benchmarks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
parameters:
99
- string:
1010
name: branch_specifier
11-
default: refs/heads/master
11+
default: refs/heads/main
1212
description: The Git branch specifier to build
1313
triggers:
1414
- timed: "H H/12 * * *"

.ci/jobs/elastic+go-elasticsearch+master.yml .ci/jobs/elastic+go-elasticsearch+main.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
- job:
3-
name: elastic+go-elasticsearch+master
4-
display-name: 'elastic / go-elasticsearch # master'
5-
description: Testing the go-elasticsearch master branch.
3+
name: elastic+go-elasticsearch+main
4+
display-name: 'elastic / go-elasticsearch # main'
5+
description: Testing the go-elasticsearch main branch.
66
junit_results: "*-junit.xml"
77
parameters:
88
- string:
99
name: branch_specifier
10-
default: refs/heads/master
10+
default: refs/heads/main
1111
description: The Git branch specifier to build
1212
triggers:
1313
- github

.ci/scripts/benchmarks/run-benchmarks.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ trap cleanup INT TERM EXIT;
6060
if [[ ! -d "$WORKSPACE/tmp/elasticsearch-clients-benchmarks" ]]; then
6161
git clone --depth 1 git@github.com:elastic/elasticsearch-clients-benchmarks.git "$WORKSPACE/tmp/elasticsearch-clients-benchmarks"
6262
else
63-
cd "$WORKSPACE/tmp/elasticsearch-clients-benchmarks" && git fetch --quiet && git reset origin/master --hard
63+
cd "$WORKSPACE/tmp/elasticsearch-clients-benchmarks" && git fetch --quiet && git reset origin/main --hard
6464
fi
6565

6666
cd "$WORKSPACE/tmp/elasticsearch-clients-benchmarks/terraform/gcp"

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ on:
66
push:
77
branches:
88
- github-actions
9-
- master
9+
- main
1010
- 7.x
1111
- 6.x
1212
pull_request:
1313
branches:
14-
- master
14+
- main
1515
- 7.x
1616
- 6.x
1717

.github/workflows/test-integration.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ on:
66
push:
77
branches:
88
- github-actions
9-
- master
9+
- main
1010
- 7.x
1111
- 6.x
1212
pull_request:
1313
branches:
14-
- master
14+
- main
1515
- 7.x
1616
- 6.x
1717

.github/workflows/test-unit.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ on:
66
push:
77
branches:
88
- github-actions
9-
- master
9+
- main
1010
- 7.x
1111
- 6.x
1212
pull_request:
1313
branches:
14-
- master
14+
- main
1515
- 7.x
1616
- 6.x
1717

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ apidiff: ## Display API incompabilities
181181
fi; \
182182
}
183183

184-
backport: ## Backport one or more commits from master into version branches
184+
backport: ## Backport one or more commits from main into version branches
185185
ifeq ($(origin commits), undefined)
186186
@echo "Missing commit(s), exiting..."
187187
@exit 2

0 commit comments

Comments
 (0)