diff --git a/build.gradle b/build.gradle index 342f87df76..4f8ba4f553 100644 --- a/build.gradle +++ b/build.gradle @@ -1264,7 +1264,7 @@ project(':forge') { } def baseForgeVersionProperty = project.objects.property(String) - baseForgeVersionProperty.set(project.provider { getLatestForgeVersion(MC_VERSION) }.map { MC_VERSION + '-' + it }) + baseForgeVersionProperty.set(project.provider { TeamcityRequests.attemptFindBase(rootDir) ?: getLatestForgeVersion(MC_VERSION) }) baseForgeVersionProperty.finalizeValueOnRead() def jarCompatibilityTaskSetup = { task -> task.group = 'jar compatibility' diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 3762587968..770eed9f5a 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -9,4 +9,5 @@ dependencies { implementation 'net.minecraftforge:srgutils:0.4.+' implementation 'commons-io:commons-io:2.8.0' implementation 'com.google.code.gson:gson:2.10' + implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r' } \ No newline at end of file diff --git a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/TeamcityRequests.groovy b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/TeamcityRequests.groovy new file mode 100644 index 0000000000..d6b73c32fc --- /dev/null +++ b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/TeamcityRequests.groovy @@ -0,0 +1,74 @@ +package net.minecraftforge.forge.tasks + +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import groovy.transform.CompileStatic +import org.eclipse.jgit.api.Git + +import javax.annotation.Nullable +import java.util.stream.Collectors + +@CompileStatic +class TeamcityRequests { + public static final Gson GSON = new Gson() + + @Nullable + static T jsonRequest(TypeToken clazz, String url) throws Exception { + final HttpURLConnection conn = (HttpURLConnection) URI.create(url).toURL().openConnection() + conn.setRequestProperty('Accept', 'application/json') + conn.setReadTimeout(5 * 1000) + conn.setConnectTimeout(5 * 1000) + conn.connect() + + if (conn.responseCode !== 200) { + return null + } + + try (final InputStream is = conn.getInputStream()) { + GSON.fromJson(new InputStreamReader(is), clazz.getType()) + } + } + + @Nullable + static Map buildsByCommit() throws IOException { + final Map builds = [:] + jsonRequest(new TypeToken() {}, "https://teamcity.minecraftforge.net/guestAuth/app/rest/builds?fields=build:(revisions,number)&locator=buildType:(id:MinecraftForge_MinecraftForge_MinecraftForge_MinecraftForge__Build),count:300,status:SUCCESS") + ?.build?.forEach { + it.revisions.revision.each { rev -> builds[rev.version] = it } + } + return builds + } + + @Nullable + static String attemptFindBase(File gitPath) { + try (final git = Git.open(gitPath)) { + final Map buildByCommit = buildsByCommit() + for (final commit in git.log().setMaxCount(100).call()) { + // Find the first commit which was built on CI + final build = buildByCommit[commit.id.name] + if (build) { + return build.number + } + } + } catch (Exception ignored) {} + return null + } + + static final class Builds { + public List build + } + + static final class Build { + public String number + public Revisions revisions + } + + static final class Revisions { + public int count + public List revision + } + + static final class Revision { + public String version + } +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy index 791d5d1f08..ae23d34ee5 100644 --- a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy +++ b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy @@ -150,9 +150,10 @@ public class Util { } } - public static String getLatestForgeVersion(mcVersion) { - def json = new JsonSlurper().parseText(new URL("https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json").getText("UTF-8")) - return json.promos["$mcVersion-latest"] + static String getLatestForgeVersion(mcVersion) { + final json = new JsonSlurper().parseText(new URL('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json').getText('UTF-8')) + final ver = json.promos["$mcVersion-latest"] + ver === null ? null : (mcVersion + '-' + ver) } static void processClassNodes(File file, Closure process) {