diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index f2c5acd67..443af853b 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -89,8 +89,8 @@ jobs: file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../../Ex" CTEST_SOURCE_DIRECTORY) file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../../bld/" CTEST_BINARY_DIRECTORY) set(dashboard_source_name "${GITHUB_REPOSITORY}") - if(ENV{GITHUB_REF} MATCHES "master") - set(branch "-master") + if(ENV{GITHUB_REF} MATCHES "main") + set(branch "-main") set(dashboard_model "Continuous") else() set(branch "-${GITHUB_REF}") @@ -183,8 +183,8 @@ jobs: file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../../Ex" CTEST_SOURCE_DIRECTORY) file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../../bld/" CTEST_BINARY_DIRECTORY) set(dashboard_superbuild 1) - if(ENV{GITHUB_REF} MATCHES "master") - set(branch "-master") + if(ENV{GITHUB_REF} MATCHES "main") + set(branch "-main") set(dashboard_model "Continuous") else() set(branch "-${GITHUB_REF}") @@ -322,8 +322,8 @@ jobs: file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../../Ex" CTEST_SOURCE_DIRECTORY) file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../../bld/" CTEST_BINARY_DIRECTORY) set(dashboard_superbuild 1) - if(ENV{GITHUB_REF} MATCHES "master") - set(branch "-master") + if(ENV{GITHUB_REF} MATCHES "main") + set(branch "-main") set(dashboard_model "Continuous") else() set(branch "-${GITHUB_REF}") @@ -382,7 +382,7 @@ jobs: uses: nwtgck/actions-netlify@v3.0.0 with: publish-dir: '${{ github.workspace }}/site' - production-branch: master + production-branch: main production-deploy: true github-token: ${{ secrets.GITHUB_TOKEN }} deploy-message: ${{ github.event.pull_request.title }}) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ffe248709..4c2d54586 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -28,5 +28,5 @@ jobs: VALIDATE_PYTHON_BLACK: true # VALIDATE_YAML: true .clang-format file does not pass validation FILTER_REGEX_EXCLUDE: (.github/labeler.yml|.*\.clang-format) - DEFAULT_BRANCH: master + DEFAULT_BRANCH: main GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.rst b/README.rst index f14ee2204..e3503b201 100644 --- a/README.rst +++ b/README.rst @@ -1,11 +1,11 @@ ITK Sphinx Examples =================== -.. image:: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/workflows/Build,%20test,%20publish/badge.svg?branch=master - :target: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/actions?query=workflow%3A%22Build%2C+test%2C+publish%22+branch%3Amaster +.. image:: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/workflows/Build,%20test,%20publish/badge.svg?branch=main + :target: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/actions?query=workflow%3A%22Build%2C+test%2C+publish%22+branch%3Amain .. image:: https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=shield - :target: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/blob/master/LICENSE + :target: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/blob/main/LICENSE A set of cookbook examples for the Insight Toolkit, ITK_. diff --git a/Utilities/Dashboard/itkexamples_common.cmake b/Utilities/Dashboard/itkexamples_common.cmake index 4cff78ded..dd50baa68 100644 --- a/Utilities/Dashboard/itkexamples_common.cmake +++ b/Utilities/Dashboard/itkexamples_common.cmake @@ -140,9 +140,9 @@ if(NOT DEFINED dashboard_git_url) endif() if(NOT DEFINED dashboard_git_branch) #if("${dashboard_model}" STREQUAL "Nightly") - # set(dashboard_git_branch nightly-master) + # set(dashboard_git_branch nightly-main) #else() - set(dashboard_git_branch master) + set(dashboard_git_branch main) #endif() endif() if(NOT DEFINED dashboard_git_crlf) diff --git a/Utilities/GitSetup/git-review-push b/Utilities/GitSetup/git-review-push index 3530c69fd..81d06c1de 100755 --- a/Utilities/GitSetup/git-review-push +++ b/Utilities/GitSetup/git-review-push @@ -55,7 +55,7 @@ test -n "$remote" || remote="origin" if test -z "$no_topic"; then # Identify and validate the topic branch name. topic="$(git symbolic-ref HEAD | sed -e 's|^refs/heads/||')" - if test "$topic" = "master"; then + if test "$topic" = "main"; then die 'Please name your topic: git checkout -b descriptive-name' fi @@ -68,11 +68,11 @@ if test -z "$refspecs"; then exit 0 fi -# Fetch the current upstream master branch head. +# Fetch the current upstream main branch head. # This helps the computation of a minimal pack to push. if test -z "$upstream_remote"; then - echo "Fetching $upstream_remote master" - fetch_out=$(git fetch "$upstream_remote" master 2>&1) || die "$fetch_out" + echo "Fetching $upstream_remote main" + fetch_out=$(git fetch "$upstream_remote" main 2>&1) || die "$fetch_out" fi # Push. Save output and exit code. diff --git a/Utilities/GitSetup/setup-git-aliases b/Utilities/GitSetup/setup-git-aliases index 8dbc13204..e5d976042 100755 --- a/Utilities/GitSetup/setup-git-aliases +++ b/Utilities/GitSetup/setup-git-aliases @@ -3,11 +3,11 @@ # Alias to checkout a pull request by its numerical id git config alias.pr "!bash Utilities/GitSetup/git-pr" # Remove previously checked out pull request -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' +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' # Alias to push the current topic branch to GitHub git config alias.review-push "!bash Utilities/GitSetup/git-review-push" # Useful alias to see what commits are on the current branch with respect to -# upstream/master -git config alias.prepush 'log --graph --stat upstream/master..' +# upstream/main +git config alias.prepush 'log --graph --stat upstream/main..' diff --git a/Utilities/SetupForDevelopment.sh b/Utilities/SetupForDevelopment.sh index 7fe15363e..8bc48fdf5 100755 --- a/Utilities/SetupForDevelopment.sh +++ b/Utilities/SetupForDevelopment.sh @@ -28,13 +28,13 @@ Utilities/GitSetup/setup-git-aliases && echo && Utilities/GitSetup/tips && Utilities/GitSetup/github-tips -# Rebase master by default +# Rebase main by default git config rebase.stat true -git config branch.master.rebase true +git config branch.main.rebase true -# Rebase master by default +# Rebase main by default git config rebase.stat true -git config branch.master.rebase true +git config branch.main.rebase true # Record the version of this setup so Hooks/pre-commit can check it. SetupForDevelopment_VERSION=1 diff --git a/src/Core/Transform/MutualInformationAffine/Documentation.rst b/src/Core/Transform/MutualInformationAffine/Documentation.rst index c13e4b84d..4728df73e 100644 --- a/src/Core/Transform/MutualInformationAffine/Documentation.rst +++ b/src/Core/Transform/MutualInformationAffine/Documentation.rst @@ -51,7 +51,7 @@ Jupyter Notebook ---------------- .. image:: https://mybinder.org/badge_logo.svg - :target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKSphinxExamples/master?filepath=src%2FCore%2FTransform%2FMutualInformationAffine%2FMutualInformationAffine.ipynb + :target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKSphinxExamples/main?filepath=src%2FCore%2FTransform%2FMutualInformationAffine%2FMutualInformationAffine.ipynb Code diff --git a/src/Filtering/ImageStatistics/CalculateImageMoments/Documentation.rst b/src/Filtering/ImageStatistics/CalculateImageMoments/Documentation.rst index 733835242..ad1d344ab 100644 --- a/src/Filtering/ImageStatistics/CalculateImageMoments/Documentation.rst +++ b/src/Filtering/ImageStatistics/CalculateImageMoments/Documentation.rst @@ -57,7 +57,7 @@ Jupyter Notebook ----------------- .. image:: https://mybinder.org/badge_logo.svg - :target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKExamples/master?filepath=src%2FFiltering%2FImageStatistics%2FImageMomentsCalculator%2FCalculateEllipseMoments.ipynb + :target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKExamples/main?filepath=src%2FFiltering%2FImageStatistics%2FImageMomentsCalculator%2FCalculateEllipseMoments.ipynb Code ---- diff --git a/src/Numerics/Optimizers/ExhaustiveOptimizer/Documentation.rst b/src/Numerics/Optimizers/ExhaustiveOptimizer/Documentation.rst index 403f6de2a..87f766e0d 100644 --- a/src/Numerics/Optimizers/ExhaustiveOptimizer/Documentation.rst +++ b/src/Numerics/Optimizers/ExhaustiveOptimizer/Documentation.rst @@ -30,7 +30,7 @@ Jupyter Notebook ----------------- .. image:: https://mybinder.org/badge_logo.svg - :target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKSphinxExamples/master?filepath=src%2FNumerics%2FOptimizers%2FExhaustiveOptimizer%2FPlotExhaustiveOptimizer.ipynb + :target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKSphinxExamples/main?filepath=src%2FNumerics%2FOptimizers%2FExhaustiveOptimizer%2FPlotExhaustiveOptimizer.ipynb Code ---- diff --git a/src/Registration/Common/MutualInformation/Documentation.rst b/src/Registration/Common/MutualInformation/Documentation.rst index e7cab01d4..c0d73199c 100644 --- a/src/Registration/Common/MutualInformation/Documentation.rst +++ b/src/Registration/Common/MutualInformation/Documentation.rst @@ -53,7 +53,7 @@ Jupyter Notebook ---------------- .. image:: https://mybinder.org/badge_logo.svg - :target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKSphinxExamples/master?filepath=src%2FRegistration%2FCommon%2FMutualInformation%2FMutualInformation.ipynb + :target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKSphinxExamples/main?filepath=src%2FRegistration%2FCommon%2FMutualInformation%2FMutualInformation.ipynb Code ---- diff --git a/src/Registration/Metricsv4/RegisterTwoPointSets/Documentation.rst b/src/Registration/Metricsv4/RegisterTwoPointSets/Documentation.rst index 6205f0c83..735637f4c 100644 --- a/src/Registration/Metricsv4/RegisterTwoPointSets/Documentation.rst +++ b/src/Registration/Metricsv4/RegisterTwoPointSets/Documentation.rst @@ -54,7 +54,7 @@ Jupyter Notebook ---------------- .. image:: https://mybinder.org/badge_logo.svg - :target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKSphinxExamples/master?filepath=src%2FRegistration%2FMetricsv4%2FRegisterTwoPointSets%2FRegisterTwoPointSets.ipynb + :target: https://mybinder.org/v2/gh/InsightSoftwareConsortium/ITKSphinxExamples/main?filepath=src%2FRegistration%2FMetricsv4%2FRegisterTwoPointSets%2FRegisterTwoPointSets.ipynb Code --------