这是indexloc提供的服务,不要输入任何密码
Skip to content
Closed
1 change: 1 addition & 0 deletions packages/llama-cpp/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 7 additions & 4 deletions scripts/lint-packages.sh
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,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

Expand Down