diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a86a3b3..78ee82d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ permissions: jobs: build: - uses: Modflower/workflows/.github/workflows/mod-publish.yml@main + uses: Pridecraft-Studios/workflows/.github/workflows/mod-publish.yml@main with: artifacts: | */build/libs/* diff --git a/buildSrc/src/main/java/gay/ampflower/BuildPlugin.java b/buildSrc/src/main/java/gay/ampflower/BuildPlugin.java index aa524c2..a54190f 100644 --- a/buildSrc/src/main/java/gay/ampflower/BuildPlugin.java +++ b/buildSrc/src/main/java/gay/ampflower/BuildPlugin.java @@ -40,7 +40,7 @@ public class BuildPlugin implements Plugin { version, Util.mkVersion(version + "+mc." + minecraftVersion), Util.getVersionType(version), - Util.mkChangelog(Properties.str(target, "github")), + Util.mkChangelog(Properties.str(target, "github"), Properties.str(target, "forge")), Util.getCompatibleVersions(libs, target) )); diff --git a/buildSrc/src/main/java/gay/ampflower/internal/Properties.java b/buildSrc/src/main/java/gay/ampflower/internal/Properties.java index 82e73ac..cebd0d0 100644 --- a/buildSrc/src/main/java/gay/ampflower/internal/Properties.java +++ b/buildSrc/src/main/java/gay/ampflower/internal/Properties.java @@ -22,7 +22,7 @@ public final class Properties { } public static @Nullable String str(Project project, String property) { - final var p = project.property(property); + final var p = project.findProperty(property); if (p == null) { return null; } diff --git a/buildSrc/src/main/java/gay/ampflower/internal/Util.java b/buildSrc/src/main/java/gay/ampflower/internal/Util.java index 61481ca..caa4ee5 100644 --- a/buildSrc/src/main/java/gay/ampflower/internal/Util.java +++ b/buildSrc/src/main/java/gay/ampflower/internal/Util.java @@ -24,7 +24,7 @@ public class Util { return URLEncoder.encode(str, StandardCharsets.UTF_8); } - public static String mkChangelog(String git) { + public static String mkChangelog(String git, String forge) { if (!isBlank(Env.Changelog)) { logger.debug("Changelog found, returning {}", Env.Changelog); return Env.Changelog; @@ -35,8 +35,10 @@ public class Util { return null; } - if (startsWith(Env.Reference, "refs/tags/")) { - final var host = VcsHost.find(git); + final var host = VcsHost.find(git, forge); + if (host == null) { + logger.warn("Forge not found. Returning bare link to {}", git); + } else if (startsWith(Env.Reference, "refs/tags/")) { logger.warn("Changelog not found but tag reference was, returning link to {}{}{}", git, host.release, urlEncode(Env.getTag())); diff --git a/buildSrc/src/main/java/gay/ampflower/internal/VcsHost.java b/buildSrc/src/main/java/gay/ampflower/internal/VcsHost.java index 6511d66..559bebc 100644 --- a/buildSrc/src/main/java/gay/ampflower/internal/VcsHost.java +++ b/buildSrc/src/main/java/gay/ampflower/internal/VcsHost.java @@ -17,7 +17,7 @@ public enum VcsHost { this.release = release; } - public static VcsHost find(String url) { + public static VcsHost find(String url, String forge) { // "https://".length = 8 final int lastSlash = url.indexOf('/', 8); for (final var host : values()) { @@ -28,6 +28,11 @@ public enum VcsHost { return host; } } + for (final var host : values()) { + if (host.name().equals(forge)) { + return host; + } + } return null; } }