release skipping logic moved to Releaser class

src/integration/groovy/pl/allegro/tech/build/axion/release/BaseIntegrationTest.groovy

@@ -25,6 +25,7 @@ class BaseIntegrationTest extends RepositoryBasedTest {
  """
 
  project.version = scmVersion.version
+ scmVersion.ignoreGlobalGitConfig = true
  """)
  }
 
@@ -48,6 +49,7 @@ class BaseIntegrationTest extends RepositoryBasedTest {
  try {
  return gradle().withArguments(args).build()
  }
+
  finally {
  def ccDir = new File(temporaryFolder, "build/reports/configuration-cache")
  if (ccDir.exists() && ccDir.isDirectory()) {

src/integration/groovy/pl/allegro/tech/build/axion/release/SimpleIntegrationTest.groovy

@@ -13,7 +13,7 @@ import static pl.allegro.tech.build.axion.release.TagPrefixConf.fullPrefix
 class SimpleIntegrationTest extends BaseIntegrationTest {
 
  @Rule
- EnvironmentVariables environmentVariablesRule = new EnvironmentVariables();
+ EnvironmentVariables environmentVariablesRule = new EnvironmentVariables()
 
  def "should return default version on calling currentVersion task on vanilla repo"() {
  given:
@@ -155,7 +155,7 @@ class SimpleIntegrationTest extends BaseIntegrationTest {
 
  then:
  releaseResult.task(':release').outcome == TaskOutcome.SUCCESS
- releaseResult.output.contains('Release step skipped since \'releaseOnlyOnDefaultBranches\' option is set, and \'master\' was not in \'releaseBranchNames\' list [develop, release]')
+ releaseResult.output.contains('Release step skipped since \'releaseOnlyOnDefaultBranches\' option is set, and \'master\' was not in \'releaseBranchNames\' list [develop,release]')
  }
 
  def "should skip release when releaseOnlyOnReleaseBranches is set by gradle task property and current branch is not on releaseBranchNames list"() {
@@ -167,7 +167,7 @@ class SimpleIntegrationTest extends BaseIntegrationTest {
 
  then:
  releaseResult.task(':release').outcome == TaskOutcome.SUCCESS
- releaseResult.output.contains('Release step skipped since \'releaseOnlyOnDefaultBranches\' option is set, and \'master\' was not in \'releaseBranchNames\' list [develop, release]')
+ releaseResult.output.contains('Release step skipped since \'releaseOnlyOnDefaultBranches\' option is set, and \'master\' was not in \'releaseBranchNames\' list [develop,release]')
  }
 
  def "should not skip release when releaseOnlyOnReleaseBranches is true when on master branch (default releaseBranches list)"() {

src/main/groovy/pl/allegro/tech/build/axion/release/CreateReleaseTask.groovy

@@ -1,6 +1,5 @@
 package pl.allegro.tech.build.axion.release
 
-
 import org.gradle.api.tasks.TaskAction
 import pl.allegro.tech.build.axion.release.domain.Releaser
 import pl.allegro.tech.build.axion.release.infrastructure.di.VersionResolutionContext
@@ -11,6 +10,11 @@ abstract class CreateReleaseTask extends BaseAxionTask {
  void release() {
  VersionResolutionContext context = resolutionContext()
  Releaser releaser = context.releaser()
- releaser.release(context.rules())
+ def scmService = context.scmService()
+ def repository = context.repository()
+ def releaseBranchNames = scmService.getReleaseBranchNames()
+ def currentBranch = repository.currentPosition().getBranch()
+ def isReleaseOnlyOnDefaultBranches = scmService.isReleaseOnlyOnDefaultBranches()
+ releaser.release(context.rules(), isReleaseOnlyOnDefaultBranches, currentBranch, releaseBranchNames)
  }
 }

src/main/groovy/pl/allegro/tech/build/axion/release/ReleaseTask.groovy

@@ -17,17 +17,10 @@ abstract class ReleaseTask extends BaseAxionTask {
  VersionResolutionContext context = resolutionContext()
  Releaser releaser = context.releaser()
  ScmService scmService = context.scmService()
-
- if (scmService.isReleaseOnlyOnDefaultBranches()) {
- def releaseBranchNames = scmService.getReleaseBranchNames()
- def currentBranch = context.repository().currentPosition().getBranch()
- if (!releaseBranchNames.contains(currentBranch)) {
- logger.quiet("Release step skipped since 'releaseOnlyOnDefaultBranches' option is set, and '${currentBranch}' was not in 'releaseBranchNames' list [${releaseBranchNames.join(', ')}]")
- return
- }
- }
-
- ScmPushResult result = releaser.releaseAndPush(context.rules())
+ def releaseBranchNames = scmService.getReleaseBranchNames()
+ def currentBranch = context.repository().currentPosition().getBranch()
+ def isReleaseOnlyOnDefaultBranches = scmService.isReleaseOnlyOnDefaultBranches()
+ ScmPushResult result = releaser.releaseAndPush(context.rules(), isReleaseOnlyOnDefaultBranches, currentBranch, releaseBranchNames)
 
  if (!result.success) {
  def status = result.failureStatus

src/main/groovy/pl/allegro/tech/build/axion/release/domain/BaseExtension.groovy

@@ -28,11 +28,11 @@ abstract class BaseExtension {
  GradleVersion.current()
  }
 
- protected Provider<Set<String>> gradleSetProperty(String name) {
+ protected Provider<Set<String>> gradlePropertyAsSet(String name) {
  return gradleProperty(name).map({ it.tokenize(',') as Set })
  }
 
- protected Provider<Boolean> gradlePropertyBoolean(String name) {
+ protected Provider<Boolean> gradlePropertyAsBoolean(String name) {
  return gradleProperty(name).map(Boolean::valueOf)
  }
 

src/main/groovy/pl/allegro/tech/build/axion/release/domain/RepositoryConfig.groovy

@@ -89,7 +89,7 @@ abstract class RepositoryConfig extends BaseExtension {
  }
 
  Provider<Boolean> overriddenIsClean() {
- gradlePropertyBoolean(OVERRIDDEN_IS_CLEAN)
+ gradlePropertyAsBoolean(OVERRIDDEN_IS_CLEAN)
  }
 
  Provider<Boolean> disableSshAgent() {

src/main/groovy/pl/allegro/tech/build/axion/release/domain/VersionConfig.groovy

@@ -44,7 +44,8 @@ abstract class VersionConfig extends BaseExtension {
  getIgnoreUncommittedChanges().convention(true)
  getUseHighestVersion().convention(false)
  getUnshallowRepoOnCI().convention(false)
- getReleaseBranchNames().convention(gradleSetProperty(RELEASE_BRANCH_NAMES_PROPERTY).orElse(['master', 'main'] as Set))
+ getIgnoreGlobalGitConfig().convention(false)
+ getReleaseBranchNames().convention(gradlePropertyAsSet(RELEASE_BRANCH_NAMES_PROPERTY).orElse(['master', 'main'] as Set))
  getReleaseOnlyOnReleaseBranches().convention(gradlePropertyPresent(RELEASE_ONLY_ON_RELEASE_BRANCHES_PROPERTY).orElse(false))
  getReleaseBranchPattern().convention(Pattern.compile('^' + defaultPrefix() + '(/.*)?$'))
  getSanitizeVersion().convention(true)
@@ -89,6 +90,9 @@ abstract class VersionConfig extends BaseExtension {
  @Internal
  abstract Property<Boolean> getReleaseOnlyOnReleaseBranches()
 
+ @Internal
+ abstract Property<Boolean> getIgnoreGlobalGitConfig()
+
  @Internal
  @Incubating
  abstract Property<Boolean> getUnshallowRepoOnCI();

src/main/groovy/pl/allegro/tech/build/axion/release/infrastructure/config/ScmPropertiesFactory.groovy

@@ -19,7 +19,8 @@ class ScmPropertiesFactory {
  ScmIdentityFactory.create(config.repository, config.repository.disableSshAgent().get()),
  config.getUnshallowRepoOnCI().get(),
  config.getReleaseBranchNames().get(),
- config.getReleaseOnlyOnReleaseBranches().get()
+ config.getReleaseOnlyOnReleaseBranches().get(),
+ config.getIgnoreGlobalGitConfig().get()
  )
  }
 }

src/main/java/pl/allegro/tech/build/axion/release/domain/Releaser.java

@@ -9,6 +9,7 @@
 import pl.allegro.tech.build.axion.release.domain.scm.ScmService;
 
 import java.util.Optional;
+import java.util.Set;
 
 public class Releaser {
 
@@ -23,10 +24,20 @@ public Releaser(VersionService versionService, ScmService repository, ReleaseHoo
  this.hooksRunner = hooksRunner;
  }
 
- public Optional<String> release(Properties properties) {
+ public Optional<String> release(Properties properties,
+ boolean isReleaseOnlyOnDefaultBranches,
+ String currentBranch,
+ Set<String> releaseBranchNames) {
+ if (isReleaseOnlyOnDefaultBranches && !releaseBranchNames.contains(currentBranch)) {
+ String message = String.format("Release step skipped since 'releaseOnlyOnDefaultBranches' option is set, and '%s' was not in 'releaseBranchNames' list [%s]", currentBranch, String.join(",", releaseBranchNames));
+ logger.quiet(message);
+ return Optional.empty();
+ }
+
  VersionContext versionContext = versionService.currentVersion(
  properties.getVersion(), properties.getTag(), properties.getNextVersion()
  );
+
  Version version = versionContext.getVersion();
 
  if (versionContext.isSnapshot()) {
@@ -43,11 +54,17 @@ public Optional<String> release(Properties properties) {
  logger.quiet("Working on released version " + version + ", nothing to release");
  return Optional.empty();
  }
-
  }
 
- public ScmPushResult releaseAndPush(Properties rules) {
- Optional<String> releasedTagName = release(rules);
+ public ScmPushResult releaseAndPush(Properties rules,
+ boolean isReleaseOnlyOnDefaultBranches,
+ String currentBranch,
+ Set<String> releaseBranchNames) {
+ Optional<String> releasedTagName = release(rules, isReleaseOnlyOnDefaultBranches, currentBranch, releaseBranchNames);
+
+ if (releasedTagName.isEmpty()) {
+ return new ScmPushResult(true, Optional.empty(), Optional.empty());
+ }
 
  ScmPushResult result = pushRelease();
 

src/main/java/pl/allegro/tech/build/axion/release/domain/scm/ScmProperties.java

@@ -19,6 +19,7 @@ public class ScmProperties {
  private final Boolean unshallowRepoOnCI;
  private final Set<String> releaseBranchNames;
  private final boolean releaseOnlyOnReleaseBranches;
+ private final boolean ignoreGlobalGitConfig;
 
  public ScmProperties(
  String type,
@@ -33,7 +34,8 @@ public ScmProperties(
  ScmIdentity identity,
  Boolean unshallowRepoOnCI,
  Set<String> releaseBranchNames,
- boolean releaseOnlyOnReleaseBranches
+ boolean releaseOnlyOnReleaseBranches,
+ boolean ignoreGlobalGitConfig
  ) {
  this.type = type;
  this.directory = directory;
@@ -48,6 +50,7 @@ public ScmProperties(
  this.unshallowRepoOnCI = unshallowRepoOnCI;
  this.releaseBranchNames = releaseBranchNames;
  this.releaseOnlyOnReleaseBranches = releaseOnlyOnReleaseBranches;
+ this.ignoreGlobalGitConfig = ignoreGlobalGitConfig;
  }
 
  public ScmPushOptions pushOptions() {
@@ -105,4 +108,8 @@ public Set<String> getReleaseBranchNames() {
  public boolean isReleaseOnlyOnReleaseBranches() {
  return releaseOnlyOnReleaseBranches;
  }
+
+ public boolean isIgnoreGlobalGitConfig() {
+ return ignoreGlobalGitConfig;
+ }
 }

src/main/java/pl/allegro/tech/build/axion/release/infrastructure/git/GitRepository.java

@@ -38,8 +38,7 @@ public class GitRepository implements ScmRepository {
  private final ScmProperties properties;
 
  public GitRepository(ScmProperties properties) {
- SystemReader.setInstance(new SystemReaderWithoutSystemConfig());
-
+ SystemReader.setInstance(new SystemReaderWithoutSystemConfig(properties.isIgnoreGlobalGitConfig()));
  try {
  this.repositoryDir = properties.getDirectory();
  this.jgitRepository = Git.open(repositoryDir);

src/main/java/pl/allegro/tech/build/axion/release/infrastructure/git/SystemReaderWithoutSystemConfig.java

@@ -5,43 +5,43 @@
 import org.eclipse.jgit.util.FS;
 import org.eclipse.jgit.util.SystemReader;
 
-public class SystemReaderWithoutSystemConfig extends SystemReader
-{
+public class SystemReaderWithoutSystemConfig extends SystemReader {
  private static final SystemReader DefaultSystemReader = SystemReader.getInstance();
+ private final boolean ignoreUserSettings;
+
+ public SystemReaderWithoutSystemConfig(boolean ignoreUserSettings) {
+ super();
+ this.ignoreUserSettings = ignoreUserSettings;
+ }
 
  @Override
- public String getenv(String variable)
- {
+ public String getenv(String variable) {
  return DefaultSystemReader.getenv(variable);
  }
 
  @Override
- public String getHostname()
- {
+ public String getHostname() {
  return DefaultSystemReader.getHostname();
  }
 
  @Override
- public String getProperty(String key)
- {
+ public String getProperty(String key) {
  return DefaultSystemReader.getProperty(key);
  }
 
  @Override
- public long getCurrentTime()
- {
+ public long getCurrentTime() {
  return DefaultSystemReader.getCurrentTime();
  }
 
  @Override
- public int getTimezone(long when)
- {
+ public int getTimezone(long when) {
  return DefaultSystemReader.getTimezone(when);
  }
 
  @Override
- public FileBasedConfig openUserConfig(Config parent, FS fs)
- {
+ public FileBasedConfig openUserConfig(Config parent, FS fs) {
+  if (ignoreUserSettings) return new EmptyFileBasedConfig(parent, fs);
  return DefaultSystemReader.openUserConfig(parent, fs);
  }
 
@@ -54,20 +54,22 @@ public FileBasedConfig openJGitConfig(Config parent, FS fs) {
  // This resolves issues with Gradle being unable to save configuration cache
  // Based on https://stackoverflow.com/a/59110721
  @Override
- public FileBasedConfig openSystemConfig(Config parent, FS fs)
- {
- return new FileBasedConfig(parent, null, fs)
- {
- @Override
- public void load()
- {
- }
+ public FileBasedConfig openSystemConfig(Config parent, FS fs) {
+ return new EmptyFileBasedConfig(parent, fs);
+ }
+
+ private static class EmptyFileBasedConfig extends FileBasedConfig {
+ public EmptyFileBasedConfig(Config parent, FS fs) {
+ super(parent, null, fs);
+ }
+
+ @Override
+ public void load() {
+ }
 
- @Override
- public boolean isOutdated()
- {
- return false;
- }
- };
+ @Override
+ public boolean isOutdated() {
+ return false;
+ }
  }
 }

src/test/groovy/pl/allegro/tech/build/axion/release/RepositoryBasedTest.groovy

@@ -1,7 +1,6 @@
 package pl.allegro.tech.build.axion.release
 
 import org.ajoberstar.grgit.Grgit
-import org.eclipse.jgit.util.SystemReader
 import pl.allegro.tech.build.axion.release.domain.LocalOnlyResolver
 import pl.allegro.tech.build.axion.release.domain.properties.PropertiesBuilder
 import pl.allegro.tech.build.axion.release.domain.scm.ScmProperties
@@ -25,9 +24,6 @@ class RepositoryBasedTest extends Specification {
  String defaultBranch
 
  void setup() {
- // let's make sure, not to use system wide user settings in tests
- setupLocalGitConfiguration()
-
  def rawRepository = Grgit.init(dir: temporaryFolder)
  defaultBranch = rawRepository.branch.current().name
 
@@ -46,17 +42,6 @@ class RepositoryBasedTest extends Specification {
  repository.commit(['*'], 'initial commit')
  }
 
- static void setupLocalGitConfiguration() {
- File testGitConfig = File.createTempFile("axion-test-git-config", ".tmp")
- testGitConfig.with {
- append "[user]\n"
- append "\tname = Axion Test User\n"
- append "\temail = [email protected]\n"
- deleteOnExit()
- }
- SystemReader.setInstance(new TestConfigSystemReader(testGitConfig))
- }
-
  protected String currentVersion() {
  return context.versionService().currentDecoratedVersion(
  context.rules().version,