Skip to content

LLM inference in C/C++

C++ ggml

ci: use shell script to check cmake pkg (#27414)

Eve0e1d9185c5fe
diff --git a/.github/workflows/build-cmake-pkg.yml b/.github/workflows/build-cmake-pkg.yml
index 0e4069ce35..c44fba2c69 100644
--- a/.github/workflows/build-cmake-pkg.yml
+++ b/.github/workflows/build-cmake-pkg.yml
@@ -27,30 +27,26 @@ jobs:
cmake --install build --prefix "$PREFIX" --config Release
export LLAMA_CONFIG="$PREFIX"/lib/cmake/llama/llama-config.cmake
- tclsh <<'EOF'
- set build(commit) [string trim [exec git rev-parse --short HEAD]]
- set build(number) [string trim [exec git rev-list --count HEAD]]
-
- set cmakelists [read [open "CMakeLists.txt" r]]
- regexp {set\(LLAMA_VERSION_MAJOR\s+(\d+)\)} $cmakelists -> major
- regexp {set\(LLAMA_VERSION_MINOR\s+(\d+)\)} $cmakelists -> minor
- regexp {set\(LLAMA_VERSION_PATCH\s+(\d+)\)} $cmakelists -> patch
- set build(version) "$major.$minor.$patch"
-
- set llamaconfig [read [open "$env(LLAMA_CONFIG)" r]]
- set checks [list "set\\(LLAMA_VERSION \\s+$build(version)\\)" \
- "set\\(LLAMA_BUILD_COMMIT\\s+$build(commit)\\)" \
- "set\\(LLAMA_BUILD_NUMBER\\s+$build(number)\\)"]
-
- puts -nonewline "Checking llama-config.cmake version... "
- foreach check $checks {
- if {![regexp -expanded -- $check $llamaconfig]} {
- puts "\"$check\" failed!"
+ build_commit=$(git rev-parse --short HEAD | xargs)
+ build_number=$(git rev-list --count HEAD | xargs)
+
+ major=$(grep -oE "set\(LLAMA_VERSION_MAJOR[[:space:]]+[0-9]+" CMakeLists.txt | grep -oE "[0-9]+$")
+ minor=$(grep -oE "set\(LLAMA_VERSION_MINOR[[:space:]]+[0-9]+" CMakeLists.txt | grep -oE "[0-9]+$")
+ patch=$(grep -oE "set\(LLAMA_VERSION_PATCH[[:space:]]+[0-9]+" CMakeLists.txt | grep -oE "[0-9]+$")
+ build_version="$major.$minor.$patch"
+
+ checks=("set\(LLAMA_VERSION[[:space:]]+$build_version\)"
+ "set\(LLAMA_BUILD_COMMIT[[:space:]]+$build_commit\)"
+ "set\(LLAMA_BUILD_NUMBER[[:space:]]+$build_number\)")
+
+ for check in "${checks[@]}"; do
+ if ! grep -qE "$check" "$LLAMA_CONFIG"; then
+ echo "Checking llama-config.cmake version... \"$check\" failed!"
exit 1
- }
- }
- puts "success."
- EOF
+ fi
+ done
+
+ echo "Checking llama-config.cmake version... success."
cd examples/simple-cmake-pkg
cmake -S . -B build -DCMAKE_PREFIX_PATH="$PREFIX"/lib/cmake