From b893ffd8ebe140493ef3e05abdebf3b661a4fca2 Mon Sep 17 00:00:00 2001
From: Technici4n <13494793+Technici4n@users.noreply.github.com>
Date: Tue, 31 Oct 2023 13:57:54 +0100
Subject: [PATCH 1/2] Remove deleted build types from TC config (#221)

---
 .teamcity/settings.kts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
index e555e2a65b..58c4090757 100644
--- a/.teamcity/settings.kts
+++ b/.teamcity/settings.kts
@@ -31,10 +31,6 @@ project {
 
     buildType(Build)
     buildType(BuildSecondaryBranches)
-    buildType(PullRequests)
-    buildType(PullRequestChecks)
-    buildType(PullRequestCompatibility)
-    buildType(PullRequestPatchModifications)
 
     params {
         text("docker_jdk_version", "17", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)

From 9a8dc606a571be4ecef05deb94a8393864f709c3 Mon Sep 17 00:00:00 2001
From: Technici4n <13494793+Technici4n@users.noreply.github.com>
Date: Tue, 31 Oct 2023 14:30:12 +0100
Subject: [PATCH 2/2] Tweak actions for PRs (#217)

---
 .github/workflows/build-prs.yml | 10 +++++++---
 build.gradle                    |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-prs.yml b/.github/workflows/build-prs.yml
index f9fe19adda..059069a5b6 100644
--- a/.github/workflows/build-prs.yml
+++ b/.github/workflows/build-prs.yml
@@ -9,17 +9,21 @@ on:
       - reopened
 
 jobs:
-  jdk17:
+  build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
           fetch-depth: 1000
           fetch-tags: true
 
+      # GradleUtils will append the branch name to the version,
+      # but for that we need a properly checked out branch
+      - name: Create branch for commit
+        run:
+          git switch -C pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.ref }}
+
       - name: Setup JDK 17
         uses: actions/setup-java@v2
         with:
diff --git a/build.gradle b/build.gradle
index 18f8b37e9f..a7f22b2de0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,9 @@ changelog {
     disableAutomaticPublicationRegistration()
 }
 
+// Print version, generally useful to know - also appears on CI
+System.out.println("NeoForge version ${gradleutils.version.toString()}")
+
 allprojects {
     version gradleutils.version.toString()
     group 'net.neoforged'