try fix ci builds

LostRuins · Nov 23, 2024 · fd073fc · fd073fc
1 parent afc575f
commit fd073fc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/create_ver_file.sh b/create_ver_file.sh
@@ -7,5 +7,5 @@ vminor=$(echo $extracted_ver | cut -d '.' -f2)
 echo "Major Version: $vmajor"
 echo "Minor Version: $vminor"
 cp version_template.txt version.txt
-sed -i "s/MYVER_MAJOR/$vmajor/g" version.txt
-sed -i "s/MYVER_MINOR/$vminor/g" version.txt
+sed "s/MYVER_MAJOR/$vmajor/g" version.txt > tempversion.txt && mv tempversion.txt version.txt
+sed "s/MYVER_MINOR/$vminor/g" version.txt > tempversion.txt && mv tempversion.txt version.txt
diff --git a/koboldcpp.sh b/koboldcpp.sh
@@ -26,8 +26,12 @@ if [ -n "$NOAVX2" ]; then
 fi
 
 bin/micromamba run -r conda -p conda/envs/linux make -j$(nproc) LLAMA_VULKAN=1 LLAMA_CLBLAST=1 LLAMA_CUBLAS=1 LLAMA_PORTABLE=1 LLAMA_ADD_CONDA_PATHS=1 $LLAMA_NOAVX2_FLAG
+if [ $? -ne 0 ]; then
+    echo "Error: make failed."
+    exit 1
+fi
 bin/micromamba run -r conda -p conda/envs/linux chmod +x "./create_ver_file.sh"
-bin/micromamba run -r conda -p conda/envs/linux . create_ver_file.sh
+bin/micromamba run -r conda -p conda/envs/linux ./create_ver_file.sh
 
 if [[ $1 == "rebuild" ]]; then
 	echo Rebuild complete, you can now try to launch Koboldcpp.