这是indexloc提供的服务，不要输入任何密码
Skip to content

revbump(x11/iso-codes): 4.19.0-1 #27177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
+9 −4
Draft

revbump(x11/iso-codes): 4.19.0-1 #27177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7b5c45
test `--no-merges` `lint-packages.sh` with log
robertkirkman Nov 10, 2025
a8b00bf
force break `lint-packages.sh` dummy commit 1
robertkirkman Nov 10, 2025
fb91c19
force break `lint-packages.sh` dummy commit 2
robertkirkman Nov 10, 2025
0e0fd0d
force break `lint-packages.sh` dummy commit 3
robertkirkman Nov 10, 2025
1017a17
revbump(x11/iso-codes): 4.19.0-1
robertkirkman Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions scripts/lint-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions x11-packages/iso-codes/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading