ENH: Use main branch name for Slicer extensions

See https://tools.ietf.org/id/draft-knodel-terminology-09.html#name-master-slave
BRAINSia · Jun 23, 2022 · f8be65a · f8be65a
1 parent 07116ef
commit f8be65a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Extensions/CMake/SlicerBlockBuildPackageAndUploadExtension.cmake b/Extensions/CMake/SlicerBlockBuildPackageAndUploadExtension.cmake
@@ -129,8 +129,8 @@ set(CTEST_DROP_SITE_CDASH TRUE)")
 endforeach()
 
 set(track_qualifier_cleaned "${Slicer_EXTENSIONS_TRACK_QUALIFIER}-")
-# Track associated with 'master' should default to either 'Continuous', 'Nightly' or 'Experimental'
-if(track_qualifier_cleaned STREQUAL "master-")
+# Track associated with 'main should default to either 'Continuous', 'Nightly' or 'Experimental'
+if(track_qualifier_cleaned STREQUAL "main-")
   set(track_qualifier_cleaned "")
 endif()
 set(track "Extensions-${track_qualifier_cleaned}${CTEST_MODEL}")

diff --git a/Extensions/CMake/SlicerBlockBuildPackageAndUploadExtensions.cmake b/Extensions/CMake/SlicerBlockBuildPackageAndUploadExtensions.cmake
@@ -124,7 +124,7 @@ foreach(EXTENSION_NAME ${EXTENSION_LIST})
   if("${EXTENSION_EXT_SCM}" STREQUAL "git")
     set(EXTENSION_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EXTENSION_NAME})
     if("${ext_revision}" STREQUAL "")
-      set(ext_revision "origin/master")
+      set(ext_revision "origin/main")
     endif()
     set(ext_ep_options_repository
       GIT_REPOSITORY ${EXTENSION_EXT_SCMURL} GIT_TAG ${ext_revision})

diff --git a/Extensions/CMake/SlicerExtensionsDashboardDriverScript.cmake b/Extensions/CMake/SlicerExtensionsDashboardDriverScript.cmake
@@ -382,8 +382,8 @@ else()
   message(FATAL_ERROR "Unknown script mode: '${SCRIPT_MODE}'. Script mode should be either 'experimental', 'continuous' or 'nightly'")
 endif()
 set(track_qualifier_cleaned "${EXTENSIONS_TRACK_QUALIFIER}-")
-# Track associated with 'master' should default to either 'Continuous', 'Nightly' or 'Experimental'
-if(track_qualifier_cleaned STREQUAL "master-")
+# Track associated with 'main should default to either 'Continuous', 'Nightly' or 'Experimental'
+if(track_qualifier_cleaned STREQUAL "main-")
   set(track_qualifier_cleaned "")
 endif()
 set(track Extensions-${track_qualifier_cleaned}${model})

diff --git a/Utilities/Scripts/SlicerWizard/GithubHelper.py b/Utilities/Scripts/SlicerWizard/GithubHelper.py
@@ -281,9 +281,9 @@ def getPullRequest(upstream, ref, user=None, fork=None, target=None):
       user = session.get_user("jdoe")
       repo = GithubHelper.getRepo(session, 'octocat/Hello-World')
 
-      # Look up request to merge 'my-branch' of any fork into 'master'
+      # Look up request to merge 'my-branch' of any fork into 'main'
       pr = GithubHelper.getPullRequest(upstream=repo, user=user,
-                                       ref='my-branch', target='master')
+                                       ref='my-branch', target='main')
 
     If any of ``user``, ``fork`` or ``target`` are ``None``, those criteria are
     not considered when searching for a matching pull request. If multiple