Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/build-test-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down Expand Up @@ -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}")
Expand Down Expand Up @@ -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}")
Expand Down Expand Up @@ -382,7 +382,7 @@ jobs:
uses: nwtgck/[email protected]
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 }})
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -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_.
Expand Down
4 changes: 2 additions & 2 deletions Utilities/Dashboard/itkexamples_common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions Utilities/GitSetup/git-review-push
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions Utilities/GitSetup/setup-git-aliases
Original file line number Diff line number Diff line change
Expand Up @@ -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..'
8 changes: 4 additions & 4 deletions Utilities/SetupForDevelopment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
----
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
----
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
----
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
--------
Expand Down
Loading