conflict

Runsafe · Dec 17, 2023 · 30e35ad · 30e35ad
1 parent e0ff883
commit 30e35ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/mvn.yml b/.github/workflows/mvn.yml
@@ -14,7 +14,7 @@ jobs:
     outputs:
       should_build: ${{ steps.check_commit.outputs.result }}
       commit: ${{ steps.latest_commit.outputs.commit }}
-      semVer: ${{ steps.gitversion.outputs.semVer }}
+      semVer: ${{ steps.gitversion.outputs.fullSemVer }}
     steps:
     - name: Clone
       uses: actions/checkout@v3

diff --git a/prepare.bat b/prepare.bat
@@ -1,5 +1,4 @@
-cd ..
-mkdir spigotmc
-cd spigotmc
+mkdir target
+cd target
 powershell -Command "Invoke-WebRequest https://hub.spigotmc.org/jenkins/job/BuildTools/lastStableBuild/artifact/target/BuildTools.jar -OutFile BuildTools.jar"
 "C:\Program Files\Eclipse Adoptium\jre-8.0.392.8-hotspot\bin\java" -jar BuildTools.jar --rev 1.12.2
diff --git a/prepare.sh b/prepare.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
-cd ..
-mkdir spigotmc
-cd spigotmc
+mkdir target
+cd target
 curl https://hub.spigotmc.org/jenkins/job/BuildTools/lastStableBuild/artifact/target/BuildTools.jar -o BuildTools.jar
 java -jar BuildTools.jar --rev 1.12.2