From: Mathieu Baudier <redacted>
Date: Tue, 19 Aug 2025 07:39:42 +0000 (+0200)
Subject: Improve ggml update
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=3a26a3ff27ba122b01024603eaa0a382b5cc5639;p=pkg%2Fggml

Improve ggml update
---

diff --git a/Makefile b/Makefile
index bd2ec5a..f14b1c3 100644
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,13 @@ GGML_BASE=sources/ggml
 update-ggml:
 	# switch to upstream branches and tag a commit
 	git -C $(GGML_BASE) switch master
-	git -C $(GGML_BASE) pull --tags github master
+	git -C $(GGML_BASE) pull github master
 	git -C $(GGML_BASE) switch upstream/latest
-	git -C $(GGML_BASE) pull --tags github master
+	git -C $(GGML_BASE) pull github master
 	
 	$(eval GGML_BUILD_NUMBER = $(shell 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)
 	
 	# Import patches before merging
@@ -39,5 +40,6 @@ update-ggml:
 	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 commit -m "Update upstream"
+	git -C $(GGML_BASE) add --all
+	git -C $(GGML_BASE) commit -m "Update upstream"