From 7a7d0339e4f169e6667bc44fc7e06be29b6c3b7b Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Sun, 9 Nov 2025 06:38:53 -0600 Subject: [PATCH 1/8] force break `lint-packages.sh` dummy commit 1 From 7c684bec59c86e090fa076cfb8ab41dd219cffbb Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Sun, 9 Nov 2025 06:38:59 -0600 Subject: [PATCH 2/8] force break `lint-packages.sh` dummy commit 2 From a0925d5bb529d801d5bcd37c05ef797110e85d70 Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Sun, 9 Nov 2025 06:39:00 -0600 Subject: [PATCH 3/8] force break `lint-packages.sh` dummy commit 3 From bc2a7f04ea10ea0ea2d557cfd3461b89636501fe Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Sun, 9 Nov 2025 06:39:02 -0600 Subject: [PATCH 4/8] force break `lint-packages.sh` dummy commit 4 From 19e9f186cbc471c3e9463044e95fdc250f49720c Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Sun, 9 Nov 2025 06:39:03 -0600 Subject: [PATCH 5/8] force break `lint-packages.sh` dummy commit 5 From ec4850db06bb33b921826ae1c951e4665b603274 Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Sun, 9 Nov 2025 06:39:30 -0600 Subject: [PATCH 6/8] revbump(main/llama-cpp): 0.0.0-b6996-1 - This PR will force `lint-packages.sh` to break --- packages/llama-cpp/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/llama-cpp/build.sh b/packages/llama-cpp/build.sh index fd9229c08a02a6..dd2162acb720b8 100644 --- a/packages/llama-cpp/build.sh +++ b/packages/llama-cpp/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="LLM inference in C/C++" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER=@termux TERMUX_PKG_VERSION="0.0.0-b6996" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/ggml-org/llama.cpp/archive/refs/tags/${TERMUX_PKG_VERSION#*-}.tar.gz TERMUX_PKG_SHA256=15bc352b6bc78d130514aa00ea2949a976c49b956994d8dc02ffff7166845718 TERMUX_PKG_AUTO_UPDATE=true From 473f4bebec9837cd3fe65214bd74f09919c28896 Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Sun, 9 Nov 2025 06:59:47 -0600 Subject: [PATCH 7/8] temporary debugging print messages in `lint-packages.sh` --- scripts/lint-packages.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/lint-packages.sh b/scripts/lint-packages.sh index 2f0dab26dace94..1d310ebbfa4195 100755 --- a/scripts/lint-packages.sh +++ b/scripts/lint-packages.sh @@ -226,7 +226,10 @@ check_version() { "" \ "TERMUX_PKG_VERSION was bumped but TERMUX_PKG_REVISION wasn't reset." \ "Please remove the 'TERMUX_PKG_REVISION=${new_revision}' line." \ - "" + "base_commit: $base_commit" \ + "HEAD commit hash: $(git rev-parse HEAD)" \ + "git status: $(git status)" \ + "git log: $(git log)" continue fi From 18b985787e87126ba7255d56090ffac56fa412e0 Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Sun, 9 Nov 2025 07:21:53 -0600 Subject: [PATCH 8/8] `lint-packages.sh` test: add `--no-merges` to `git rev-list` and `git diff` --- scripts/lint-packages.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/lint-packages.sh b/scripts/lint-packages.sh index 1d310ebbfa4195..309176b6868097 100755 --- a/scripts/lint-packages.sh +++ b/scripts/lint-packages.sh @@ -123,9 +123,9 @@ check_indentation() { # We'll need the 'origin/master' as a base commit when running the version check. # So try fetching it now if it doesn't exist. -if ! base_commit="HEAD~$(git rev-list --count FETCH_HEAD..)"; then +if ! base_commit="HEAD~$(git rev-list --no-merges --count FETCH_HEAD..)"; then git fetch https://github.com/termux/termux-packages.git - base_commit="HEAD~$(git rev-list --count FETCH_HEAD..)" + base_commit="HEAD~$(git rev-list --no-merges --count FETCH_HEAD..)" fi check_version() { @@ -155,7 +155,7 @@ check_version() { } # Was the package modified in this branch? - git diff --exit-code "${base_commit}" -- "${package_dir}" &> /dev/null && { + git diff --no-merges --exit-code "${base_commit}" -- "${package_dir}" &> /dev/null && { printf '%s\n' "PASS - ${version} (not modified in this branch)" continue }