Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/allegro#325-support-force-increm…
Browse files Browse the repository at this point in the history
…ent-release' into maiatechio
  • Loading branch information
john-tipper committed Jan 30, 2020
2 parents ba6c221 + 5fa155a commit 188ad26
Showing 1 changed file with 0 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import pl.allegro.tech.build.axion.release.domain.hooks.ReleaseHooksRunner;
import pl.allegro.tech.build.axion.release.domain.logging.ReleaseLogger;
import pl.allegro.tech.build.axion.release.domain.properties.Properties;
import pl.allegro.tech.build.axion.release.domain.scm.ScmPosition;
import pl.allegro.tech.build.axion.release.domain.scm.ScmPushResult;
import pl.allegro.tech.build.axion.release.domain.scm.ScmService;

Expand Down Expand Up @@ -37,11 +36,8 @@ public Optional<String> release(String projectRootRelativePath, Properties prope
logger.quiet("Creating tag: " + tagName);
// if snapshot then release normally, otherwise release tag on last commit that is relevant to this project
if (versionContext.isSnapshot()) {
System.out.println("isSnapshot");
repository.tag(tagName);
} else {
System.out.println("not isSnapshot");

repository.tagOnCommit(repository.positionOfLastChangeIn(projectRootRelativePath,
properties.getVersion().getMonorepoProperties().getDirsToExclude()
).getRevision(), tagName);
Expand Down

0 comments on commit 188ad26

Please sign in to comment.