mirror of
https://github.com/jlengrand/jreleaser.git
synced 2026-03-10 08:31:24 +00:00
Fix branch auto discovery
This commit is contained in:
@@ -29,10 +29,12 @@ import java.util.spi.ToolProvider;
|
||||
*/
|
||||
@ServiceProviderFor(ToolProvider.class)
|
||||
public class JReleaser implements ToolProvider {
|
||||
@Override
|
||||
public String name() {
|
||||
return "jreleaser";
|
||||
}
|
||||
|
||||
@Override
|
||||
public int run(PrintWriter out, PrintWriter err, String... args) {
|
||||
return Main.run(out, err, args);
|
||||
}
|
||||
|
||||
@@ -49,7 +49,6 @@ public class ModelAutoConfigurer {
|
||||
Repository repository = null;
|
||||
try {
|
||||
repository = GitSdk.of(context).getRemote();
|
||||
|
||||
} catch (IOException e) {
|
||||
context.getLogger().trace(e);
|
||||
throw new JReleaserException("Could not determine remote", e);
|
||||
|
||||
@@ -175,8 +175,8 @@ public class GitSdk {
|
||||
}
|
||||
|
||||
public static String extractHeadName(Ref ref) {
|
||||
if (ref.getName().startsWith(REFS_HEADS)) {
|
||||
return ref.getName().substring(REFS_HEADS.length());
|
||||
if (ref.getTarget().getName().startsWith(REFS_HEADS)) {
|
||||
return ref.getTarget().getName().substring(REFS_HEADS.length());
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
@@ -134,7 +134,7 @@ public class GiteaReleaser implements Releaser {
|
||||
// remote tag/release
|
||||
GtRelease release = new GtRelease();
|
||||
release.setName(gitea.getEffectiveReleaseName());
|
||||
release.setTagName(gitea.getEffectiveTagName(context.getModel().getProject()));
|
||||
release.setTagName(tagName);
|
||||
release.setTargetCommitish(gitea.getTargetCommitish());
|
||||
release.setBody(changelog);
|
||||
|
||||
|
||||
@@ -129,8 +129,7 @@ public class GithubReleaser implements Releaser {
|
||||
}
|
||||
|
||||
// remote tag/release
|
||||
GHRelease release = api.createRelease(github.getCanonicalRepoName(),
|
||||
github.getEffectiveTagName(context.getModel().getProject()))
|
||||
GHRelease release = api.createRelease(github.getCanonicalRepoName(), tagName)
|
||||
.commitish(github.getTargetCommitish())
|
||||
.name(github.getEffectiveReleaseName())
|
||||
.draft(github.isDraft())
|
||||
|
||||
@@ -146,7 +146,7 @@ public class GitlabReleaser implements Releaser {
|
||||
|
||||
Release release = new Release();
|
||||
release.setName(gitlab.getEffectiveReleaseName());
|
||||
release.setTagName(gitlab.getEffectiveTagName(context.getModel().getProject()));
|
||||
release.setTagName(tagName);
|
||||
release.setRef(gitlab.getRef());
|
||||
release.setDescription(changelog);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user