From 7d53f6d141b3782f1c04a8803878dd59a3e50e81 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 28 Apr 2021 23:13:10 +0100
Subject: [PATCH] Hopefully fix and simplify branch name checking

---
 .github/workflows/publish.yml | 2 +-
 build.gradle                  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1661f21c4c..6ee90f6947 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -35,4 +35,4 @@ jobs:
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
           SIGNING_SERVER: ${{ secrets.SIGNING_SERVER }}
           SIGNING_PGP_KEY: ${{ secrets.SIGNING_PGP_KEY }}
-          VALIDATE_BRANCH: true
+          BRANCH_NAME: ${{ github.ref }}
diff --git a/build.gradle b/build.gradle
index f75eb55b9c..198459a69d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,6 @@ plugins {
 	id 'java' // for jd gen
 	id 'org.cadixdev.licenser' version '0.5.1'
 	id 'net.fabricmc.filament' version '0.2.0'
-	id "org.ajoberstar.grgit" version "4.1.0"
 	id "me.modmuss50.remotesign" version "0.1.0"
 }
 
@@ -37,8 +36,8 @@ def build_number = ENV.BUILD_NUMBER ?: "local"
 def yarnVersion = "${minecraft_version}+build.$build_number"
 version = yarnVersion
 
-if (ENV.VALIDATE_BRANCH) {
-	def branch = grgit.branch.current().name
+if (ENV.BRANCH_NAME) {
+	def branch = ENV.BRANCH_NAME.substring(0, ENV.BRANCH_NAME.lastIndexOf('/'))
 	if (minecraft_version != branch) {
 		throw new IllegalStateException("Branch name (${branch}) does not match the mc version (${minecraft_version})")
 	}