Upgrade velocity; use git submodules instead of ad-hoc script

tritonmc · Jan 24, 2024 · 36b8482 · 36b8482
1 parent acba865
commit 36b8482
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-Velocity/
+.direnv
+.envrc
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "Velocity"]
+	path = Velocity
+	url = https://github.com/PaperMC/Velocity.git
+	shallow = true
diff --git a/Velocity b/Velocity
diff --git a/publish.sh b/publish.sh
@@ -1,17 +1,14 @@
 #! /usr/bin/env bash
-
-if [ ! -d "Velocity" ];
-then
-        git clone https://github.com/PaperMC/Velocity.git
-fi
+set -e
 
 cd Velocity
-git restore .
-git pull
-git clean -fd
 
 for patch in ../patches/*.patch; do
-        git apply $patch || exit
+    git apply $patch
 done
 
 ./gradlew publish
+
+ls ../patches/*.patch | tac | while read f; do
+    git apply -R $patch
+done