Handle Grgit/JGit initing 'main'

nebula-plugins · May 9, 2024 · f3d692e · f3d692e
1 parent 5723a42
commit f3d692e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/integTest/groovy/nebula/plugin/release/GitVersioningIntegrationTestKitSpec.groovy b/src/integTest/groovy/nebula/plugin/release/GitVersioningIntegrationTestKitSpec.groovy
@@ -45,6 +45,11 @@ abstract class GitVersioningIntegrationTestKitSpec extends IntegrationTestKitSpe
         originGit.add(patterns: ['build.gradle', 'settings.gradle', '.gitignore'] as Set)
         originGit.commit(message: 'Initial checkout')
 
+        if (originGit.branch.current().name == 'main') {
+            originGit.checkout(branch: 'master', createBranch: true)
+            originGit.branch.remove(names: ['main'])
+        }
+
         git = Grgit.clone(dir: projectDir, uri: origin.absolutePath) as Grgit
 
         new File(projectDir, '.gitignore') << '''.gradle-test-kit

diff --git a/src/integTest/groovy/nebula/plugin/release/ReleasePluginIntegrationSpec.groovy b/src/integTest/groovy/nebula/plugin/release/ReleasePluginIntegrationSpec.groovy
@@ -57,7 +57,6 @@ class ReleasePluginIntegrationSpec extends GitVersioningIntegrationTestKitSpec {
         version == dev('0.1.0-dev.2+')
     }
 
-
     def 'build on non standard branch appends name to dev version string'() {
         git.checkout(branch: 'testexample', createBranch: true)