Skip to content

Commit d1b828b

Browse files
thewtexthewtex
authored
Merge pull request #442 from jhlegarreta/RenameMasterToMain
STYLE: Change `master` branch mentions to `main` across files
2 parents 8503e9f + 97836ad commit d1b828b

File tree

12 files changed

+29
-29
lines changed

12 files changed

+29
-29
lines changed

‎.github/workflows/build-test-publish.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ jobs:
8989
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../../Ex" CTEST_SOURCE_DIRECTORY)
9090
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../../bld/" CTEST_BINARY_DIRECTORY)
9191
set(dashboard_source_name "${GITHUB_REPOSITORY}")
92-
if(ENV{GITHUB_REF} MATCHES "master")
93-
set(branch "-master")
92+
if(ENV{GITHUB_REF} MATCHES "main")
93+
set(branch "-main")
9494
set(dashboard_model "Continuous")
9595
else()
9696
set(branch "-${GITHUB_REF}")
@@ -183,8 +183,8 @@ jobs:
183183
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../../Ex" CTEST_SOURCE_DIRECTORY)
184184
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../../bld/" CTEST_BINARY_DIRECTORY)
185185
set(dashboard_superbuild 1)
186-
if(ENV{GITHUB_REF} MATCHES "master")
187-
set(branch "-master")
186+
if(ENV{GITHUB_REF} MATCHES "main")
187+
set(branch "-main")
188188
set(dashboard_model "Continuous")
189189
else()
190190
set(branch "-${GITHUB_REF}")
@@ -322,8 +322,8 @@ jobs:
322322
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../../Ex" CTEST_SOURCE_DIRECTORY)
323323
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../../bld/" CTEST_BINARY_DIRECTORY)
324324
set(dashboard_superbuild 1)
325-
if(ENV{GITHUB_REF} MATCHES "master")
326-
set(branch "-master")
325+
if(ENV{GITHUB_REF} MATCHES "main")
326+
set(branch "-main")
327327
set(dashboard_model "Continuous")
328328
else()
329329
set(branch "-${GITHUB_REF}")
@@ -382,7 +382,7 @@ jobs:
382382
uses: nwtgck/[email protected]
383383
with:
384384
publish-dir: '${{ github.workspace }}/site'
385-
production-branch: master
385+
production-branch: main
386386
production-deploy: true
387387
github-token: ${{ secrets.GITHUB_TOKEN }}
388388
deploy-message: ${{ github.event.pull_request.title }})

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ jobs:
2828
VALIDATE_PYTHON_BLACK: true
2929
# VALIDATE_YAML: true .clang-format file does not pass validation
3030
FILTER_REGEX_EXCLUDE: (.github/labeler.yml|.*\.clang-format)
31-
DEFAULT_BRANCH: master
31+
DEFAULT_BRANCH: main
3232
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎README.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
ITK Sphinx Examples
22
===================
33

4-
.. image:: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/workflows/Build,%20test,%20publish/badge.svg?branch=master
5-
:target: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/actions?query=workflow%3A%22Build%2C+test%2C+publish%22+branch%3Amaster
4+
.. image:: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/workflows/Build,%20test,%20publish/badge.svg?branch=main
5+
:target: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/actions?query=workflow%3A%22Build%2C+test%2C+publish%22+branch%3Amain
66

77
.. image:: https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=shield
8-
:target: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/blob/master/LICENSE
8+
:target: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/blob/main/LICENSE
99

1010

1111
A set of cookbook examples for the Insight Toolkit, ITK_.

‎Utilities/Dashboard/itkexamples_common.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ if(NOT DEFINED dashboard_git_url)
140140
endif()
141141
if(NOT DEFINED dashboard_git_branch)
142142
#if("${dashboard_model}" STREQUAL "Nightly")
143-
# set(dashboard_git_branch nightly-master)
143+
# set(dashboard_git_branch nightly-main)
144144
#else()
145-
set(dashboard_git_branch master)
145+
set(dashboard_git_branch main)
146146
#endif()
147147
endif()
148148
if(NOT DEFINED dashboard_git_crlf)

‎Utilities/GitSetup/git-review-push‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ test -n "$remote" || remote="origin"
5555
if test -z "$no_topic"; then
5656
# Identify and validate the topic branch name.
5757
topic="$(git symbolic-ref HEAD | sed -e 's|^refs/heads/||')"
58-
if test "$topic" = "master"; then
58+
if test "$topic" = "main"; then
5959
die 'Please name your topic:
6060
git checkout -b descriptive-name'
6161
fi
@@ -68,11 +68,11 @@ if test -z "$refspecs"; then
6868
exit 0
6969
fi
7070

71-
# Fetch the current upstream master branch head.
71+
# Fetch the current upstream main branch head.
7272
# This helps the computation of a minimal pack to push.
7373
if test -z "$upstream_remote"; then
74-
echo "Fetching $upstream_remote master"
75-
fetch_out=$(git fetch "$upstream_remote" master 2>&1) || die "$fetch_out"
74+
echo "Fetching $upstream_remote main"
75+
fetch_out=$(git fetch "$upstream_remote" main 2>&1) || die "$fetch_out"
7676
fi
7777

7878
# Push. Save output and exit code.

‎Utilities/GitSetup/setup-git-aliases‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# Alias to checkout a pull request by its numerical id
44
git config alias.pr "!bash Utilities/GitSetup/git-pr"
55
# Remove previously checked out pull request
6-
git config alias.pr-clean '!git checkout master ; git for-each-ref refs/heads/pr/* --format="%(refname)" | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done'
6+
git config alias.pr-clean '!git checkout main ; git for-each-ref refs/heads/pr/* --format="%(refname)" | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done'
77

88
# Alias to push the current topic branch to GitHub
99
git config alias.review-push "!bash Utilities/GitSetup/git-review-push"
1010

1111
# Useful alias to see what commits are on the current branch with respect to
12-
# upstream/master
13-
git config alias.prepush 'log --graph --stat upstream/master..'
12+
# upstream/main
13+
git config alias.prepush 'log --graph --stat upstream/main..'

‎Utilities/SetupForDevelopment.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ Utilities/GitSetup/setup-git-aliases && echo &&
2828
Utilities/GitSetup/tips &&
2929
Utilities/GitSetup/github-tips
3030

31-
# Rebase master by default
31+
# Rebase main by default
3232
git config rebase.stat true
33-
git config branch.master.rebase true
33+
git config branch.main.rebase true
3434

35-
# Rebase master by default
35+
# Rebase main by default
3636
git config rebase.stat true
37-
git config branch.master.rebase true
37+
git config branch.main.rebase true
3838

3939
# Record the version of this setup so Hooks/pre-commit can check it.
4040
SetupForDevelopment_VERSION=1

‎src/Core/Transform/MutualInformationAffine/Documentation.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Jupyter Notebook
5151
----------------
5252

5353
.. image:: https://mybinder.org/badge_logo.svg
54-
:target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKSphinxExamples/master?filepath=src%2FCore%2FTransform%2FMutualInformationAffine%2FMutualInformationAffine.ipynb
54+
:target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKSphinxExamples/main?filepath=src%2FCore%2FTransform%2FMutualInformationAffine%2FMutualInformationAffine.ipynb
5555

5656

5757
Code

‎src/Filtering/ImageStatistics/CalculateImageMoments/Documentation.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Jupyter Notebook
5757
-----------------
5858

5959
.. image:: https://mybinder.org/badge_logo.svg
60-
:target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKExamples/master?filepath=src%2FFiltering%2FImageStatistics%2FImageMomentsCalculator%2FCalculateEllipseMoments.ipynb
60+
:target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKExamples/main?filepath=src%2FFiltering%2FImageStatistics%2FImageMomentsCalculator%2FCalculateEllipseMoments.ipynb
6161

6262
Code
6363
----

‎src/Numerics/Optimizers/ExhaustiveOptimizer/Documentation.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Jupyter Notebook
3030
-----------------
3131

3232
.. image:: https://mybinder.org/badge_logo.svg
33-
:target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKSphinxExamples/master?filepath=src%2FNumerics%2FOptimizers%2FExhaustiveOptimizer%2FPlotExhaustiveOptimizer.ipynb
33+
:target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKSphinxExamples/main?filepath=src%2FNumerics%2FOptimizers%2FExhaustiveOptimizer%2FPlotExhaustiveOptimizer.ipynb
3434

3535
Code
3636
----

0 commit comments

Comments
 (0)