From d7b5c452b12c966df15627191391f10d42e2ea6e Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Sun, 9 Nov 2025 21:31:52 -0600 Subject: [PATCH 1/5] test `--no-merges` `lint-packages.sh` with log --- scripts/lint-packages.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/lint-packages.sh b/scripts/lint-packages.sh index 2f0dab26dace94..7f8ffe7c55cd73 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 } @@ -226,7 +226,11 @@ 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 diff --no-merges: $(git diff --no-merges --exit-code "${base_commit}" -- "${package_dir}")" \ + "git log: $(git log)" continue fi From a8b00bfba0f41c1f41bd18c26ac3f715e48c0eec Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Sun, 9 Nov 2025 21:33:08 -0600 Subject: [PATCH 2/5] force break `lint-packages.sh` dummy commit 1 From fb91c19855c81ec1a74d0f9158ef7929dace752a Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Sun, 9 Nov 2025 21:33:10 -0600 Subject: [PATCH 3/5] force break `lint-packages.sh` dummy commit 2 From 0e0fd0d637148a7da13bf709981c88d057be140e Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Sun, 9 Nov 2025 21:33:11 -0600 Subject: [PATCH 4/5] force break `lint-packages.sh` dummy commit 3 From 1017a17d523a7146c4fe235bfc93ca52f9645fa2 Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Sun, 9 Nov 2025 21:33:20 -0600 Subject: [PATCH 5/5] revbump(x11/iso-codes): 4.19.0-1 --- x11-packages/iso-codes/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-packages/iso-codes/build.sh b/x11-packages/iso-codes/build.sh index e82dc887f96ab4..251d3b7147e4bb 100644 --- a/x11-packages/iso-codes/build.sh +++ b/x11-packages/iso-codes/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Lists of the country, language, and currency names" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="4.19.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${TERMUX_PKG_VERSION}/iso-codes-v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=4b143a891feb7d1bb64e44fe3ef253ef36ba1185d1d129c1425338dc6e46e27d TERMUX_PKG_AUTO_UPDATE=true