Introduce automatic update of llama.cpp

diff --git a/Makefile b/Makefile
index f14b1c356fab2015824ae29afaddc0f4bc990c2e..403fe91cbc513868e92630215474c774eb283ba0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,22 @@
-
+# Pinned commits / tags
 GGML_CHECKOUT=323951f
 LLAMA_CPP_CHECKOUT=f08c4c0
 
 GGML_BASE=sources/ggml
+LLAMA_CPP_BASE=sources/llama.cpp
 
 update-ggml:
+       # make sure evrything is clean
+       git -C $(GGML_BASE) fetch origin
+       git -C $(GGML_BASE) reset --hard origin/debian/latest
+       
        # switch to upstream branches and tag a commit
        git -C $(GGML_BASE) switch master
        git -C $(GGML_BASE) pull github master
        git -C $(GGML_BASE) switch upstream/latest
        git -C $(GGML_BASE) pull github master
        
-       $(eval GGML_BUILD_NUMBER = $(shell git -C $(GGML_BASE) rev-list --count $(GGML_CHECKOUT)))
+       $(eval GGML_BUILD_NUMBER = $(shell git -C $(GGML_BASE) fetch github; git -C $(GGML_BASE) rev-list --count $(GGML_CHECKOUT)))
        @echo "GGML_BUILD_NUMBER=$(GGML_BUILD_NUMBER)"
        -git -C $(GGML_BASE) tag --delete upstream/0.0.$(GGML_BUILD_NUMBER)
        git -C $(GGML_BASE) tag -a -m "Pinned upstream commit" upstream/0.0.$(GGML_BUILD_NUMBER) $(GGML_CHECKOUT)
@@ -34,12 +39,51 @@ update-ggml:
        # Generate changelog
        echo "ggml (0.0.$(GGML_BUILD_NUMBER)-1) unstable; urgency=medium" > $(GGML_BASE)/debian/changelog
        echo "" >> $(GGML_BASE)/debian/changelog
-       echo "  * Update upstream" >> $(GGML_BASE)/debian/changelog
-       echo "" >> $(GGML_BASE)/debian/changelog
-       echo "  Closes: #1096105" >> $(GGML_BASE)/debian/changelog
+       echo "  * Update upstream based on $(GGML_CHECKOUT)" >> $(GGML_BASE)/debian/changelog
        echo "" >> $(GGML_BASE)/debian/changelog
        echo " -- Mathieu Baudier <mbaudier@argeo.org>  $(shell date --utc '+%a, %d %b %+4Y %T %z')" >> $(GGML_BASE)/debian/changelog
        
        git -C $(GGML_BASE) add --all
-       git -C $(GGML_BASE) commit -m "Update upstream"
+       git -C $(GGML_BASE) commit -m "Update upstream based on $(GGML_CHECKOUT) - 0.0.$(GGML_BUILD_NUMBER)"
+
+update-llama-cpp:
+       # make sure evrything is clean
+       git -C $(LLAMA_CPP_BASE) fetch origin
+       git -C $(LLAMA_CPP_BASE) reset --hard origin/debian/latest
+       
+       # switch to upstream branches and tag a commit
+       git -C $(LLAMA_CPP_BASE) switch master
+       git -C $(LLAMA_CPP_BASE) pull github master
+       git -C $(LLAMA_CPP_BASE) switch upstream/latest
+       git -C $(LLAMA_CPP_BASE) pull github master
+       
+       $(eval LLAMA_CPP_BUILD_NUMBER = $(shell git -C $(LLAMA_CPP_BASE) fetch github; git -C $(LLAMA_CPP_BASE) rev-list --count $(LLAMA_CPP_CHECKOUT)))
+       @echo "LLAMA_CPP_BUILD_NUMBER=$(LLAMA_CPP_BUILD_NUMBER)"
+       -git -C $(LLAMA_CPP_BASE) tag --delete upstream/0.0.$(LLAMA_CPP_BUILD_NUMBER)
+       git -C $(LLAMA_CPP_BASE) tag -a -m "Pinned upstream commit" upstream/0.0.$(LLAMA_CPP_BUILD_NUMBER) $(LLAMA_CPP_CHECKOUT)
+       
+       # Import patches before merging
+       git -C $(LLAMA_CPP_BASE) switch debian/latest
+       cd $(LLAMA_CPP_BASE) && gbp pq import
+       
+       # Merges
+       git -C $(LLAMA_CPP_BASE) switch debian/latest
+       git -C $(LLAMA_CPP_BASE) merge --no-edit upstream/0.0.$(LLAMA_CPP_BUILD_NUMBER)
+       
+       git -C $(LLAMA_CPP_BASE) switch patch-queue/debian/latest
+       git -C $(LLAMA_CPP_BASE) merge --no-edit debian/latest
+       
+       # Rebase patches
+       cd $(LLAMA_CPP_BASE) && gbp pq rebase
+       cd $(LLAMA_CPP_BASE) && gbp pq export --drop
+       
+       # Generate changelog
+       echo "llama-cpp (0.0.$(LLAMA_CPP_BUILD_NUMBER)-1) unstable; urgency=medium" > $(LLAMA_CPP_BASE)/debian/changelog
+       echo "" >> $(LLAMA_CPP_BASE)/debian/changelog
+       echo "  * Update upstream based on $(LLAMA_CPP_CHECKOUT)" >> $(LLAMA_CPP_BASE)/debian/changelog
+       echo "" >> $(LLAMA_CPP_BASE)/debian/changelog
+       echo " -- Mathieu Baudier <mbaudier@argeo.org>  $(shell date --utc '+%a, %d %b %+4Y %T %z')" >> $(LLAMA_CPP_BASE)/debian/changelog
+       
+       git -C $(LLAMA_CPP_BASE) add --all
+       git -C $(LLAMA_CPP_BASE) commit -m "Update upstream based on $(LLAMA_CPP_CHECKOUT) - 0.0.$(LLAMA_CPP_BUILD_NUMBER)"