Skip to content

Commit 83cbc37

Browse files
committed
Rename master branch to main
1 parent 79b6e3f commit 83cbc37

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

.github/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ License
2323

2424
The Mono runtime, compilers, and tools and most of the class libraries
2525
are licensed under the MIT license. But include some bits of code
26-
licensed under different licenses. The exact list is [available here](https://github.com/mono/mono/blob/master/LICENSE).
26+
licensed under different licenses. The exact list is [available here](https://github.com/mono/mono/blob/main/LICENSE).
2727

2828
Different parts of Mono use different licenses. The actual details of
2929
which licenses are used for which parts are detailed on the LICENSE

packaging/MacSDK/mono.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from bockbuild.util.util import *
66

77

8-
class MonoMasterPackage(Package):
8+
class MonoMainPackage(Package):
99

1010
def __init__(self):
1111
Package.__init__(self, 'mono', None,
@@ -96,4 +96,4 @@ def deploy(self):
9696
os.symlink('mono-sgen64', '%s/bin/mono64' % self.staged_profile)
9797
os.symlink('mono-sgen32', '%s/bin/mono32' % self.staged_profile)
9898

99-
MonoMasterPackage()
99+
MonoMainPackage()

scripts/ci/mono-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ trigger:
22
batch: true
33
branches:
44
include:
5-
- master
5+
- main
66
- 20*-*
77
paths:
88
include:
@@ -22,7 +22,7 @@ trigger:
2222
pr:
2323
branches:
2424
include:
25-
- master
25+
- main
2626
- 20*-*
2727
paths:
2828
include:

scripts/ci/mono-mono-signing.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ parameters:
22
- name: mono_branch
33
displayName: Branch
44
type: string
5-
default: master
5+
default: main
66
values:
7-
- master
7+
- main
88
- 2020-02
99
- name: mono_commit
1010
displayName: Full commit hash

scripts/ci/pipeline/osx-package.groovy

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ packageFileName = null
99
commitHash = null
1010
utils = null
1111

12-
if (monoBranch == 'master') {
12+
if (monoBranch == 'main') {
1313
properties([ /* compressBuildLog() */ // compression is incompatible with JEP-210 right now
1414
pipelineTriggers([cron('0 3 * * *')])
1515
])
1616

17-
// multi-branch pipelines still get triggered for each commit, skip these builds on master by checking whether this build was timer-triggered or manually triggered
17+
// multi-branch pipelines still get triggered for each commit, skip these builds on main by checking whether this build was timer-triggered or manually triggered
1818
if (currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause').size() == 0 && currentBuild.getBuildCauses('hudson.model.Cause$UserIdCause').size() == 0) {
19-
echo "Skipping per-commit build on master."
19+
echo "Skipping per-commit build on main."
2020
return
2121
}
2222
}

scripts/ci/pipeline/sdks-archive.groovy

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ isPr = (env.ghprbPullId && !env.ghprbPullId.empty ? true : false)
22
monoBranch = (isPr ? "pr" : env.BRANCH_NAME)
33
jobName = env.JOB_NAME.split('/').first()
44

5-
if (monoBranch == 'master') {
5+
if (monoBranch == 'main') {
66
properties([ /* compressBuildLog() */ // compression is incompatible with JEP-210 right now
77
pipelineTriggers([cron('0 3 * * *')])
88
])
99

10-
// multi-branch pipelines still get triggered for each commit, skip these builds on master by checking whether this build was timer-triggered or manually triggered
10+
// multi-branch pipelines still get triggered for each commit, skip these builds on main by checking whether this build was timer-triggered or manually triggered
1111
if (currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause').size() == 0 && currentBuild.getBuildCauses('hudson.model.Cause$UserIdCause').size() == 0) {
12-
echo "Skipping per-commit build on master."
12+
echo "Skipping per-commit build on main."
1313
return
1414
}
1515
}
@@ -72,8 +72,8 @@ parallel (
7272
}
7373
},
7474
"WASM Linux": {
75-
if (monoBranch != 'master') {
76-
echo "Skipping WASM build on non-master branch."
75+
if (monoBranch != 'main') {
76+
echo "Skipping WASM build on non-main branch."
7777
return
7878
}
7979
throttle(['provisions-wasm-toolchain']) {

0 commit comments

Comments
 (0)