When multiple branches or all branches are specified, the list of bra…

…nches will be sorted and the default branch moved to the top of the list.
avisi-cloud · Oct 13, 2023 · abb4d85 · abb4d85
1 parent 5d302c4
commit abb4d85
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/kotlin/nl/avisi/structurizr/site/generatr/GenerateSiteCommand.kt b/src/main/kotlin/nl/avisi/structurizr/site/generatr/GenerateSiteCommand.kt
@@ -82,7 +82,7 @@ class GenerateSiteCommand : Subcommand(
             refreshLocalClone()
         }
 
-        val branchNames = if (allBranches)
+        val branchNames: List<String> = if (allBranches)
             clonedRepository.getBranchNames(excludeBranches.split(","))
         else
             branches.split(",")
@@ -109,7 +109,12 @@ class GenerateSiteCommand : Subcommand(
             throw Exception("$defaultBranch does not contain a valid structurizr workspace. Site generation halted.")
         }
 
-        branchesToGenerate.forEach { branch ->
+        val sortedBranchNames = branchesToGenerate.toMutableList()
+        sortedBranchNames.sorted()
+        sortedBranchNames.remove(defaultBranch)
+        sortedBranchNames.add(0,defaultBranch)
+
+        sortedBranchNames.forEach { branch ->
             println("Generating site for branch $branch")
             clonedRepository.checkoutBranch(branch)
 
@@ -120,7 +125,7 @@ class GenerateSiteCommand : Subcommand(
                 workspace,
                 assetsDir?.let { File(cloneDir, it) },
                 siteDir,
-                branchesToGenerate,
+                sortedBranchNames,
                 branch
             )
         }