From e64925674b783ddf414617f76479cb60acdb4892 Mon Sep 17 00:00:00 2001 From: zhaodewang Date: Mon, 4 Dec 2023 21:27:46 +0800 Subject: [PATCH] fix ci. --- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- script/model_test.sh | 4 ++-- script/package.ps1 | 3 ++- script/package.sh | 3 ++- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b81c6451..f7b6a8e4 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -50,4 +50,4 @@ jobs: cd workspace unzip package.zip cd package - ./script/model_test.sh ${{ matrix.model }} \ No newline at end of file + ./script/model_test.sh ${{ matrix.model }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index acad9ca8..77a29901 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -50,4 +50,4 @@ jobs: cd workspace unzip package.zip cd package - ./script/model_test.sh ${{ matrix.model }} \ No newline at end of file + ./script/model_test.sh ${{ matrix.model }} prompt.txt diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c7f98eef..56c8b3b8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -53,5 +53,5 @@ jobs: echo ${{ matrix.model }} ./script/download_model.ps1 ${{ matrix.model }} cd build - .\Release\cli_demo -m ..\${{ matrix.model }} + .\Release\cli_demo ..\${{ matrix.model }} prompt.txt Exit 0 diff --git a/script/model_test.sh b/script/model_test.sh index c0d1608b..3708ff30 100755 --- a/script/model_test.sh +++ b/script/model_test.sh @@ -6,7 +6,7 @@ model_test() { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:. # macos export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:. - ./cli_demo -m ../$1 + ./cli_demo -m ../$1 prompt.txt cd .. } @@ -24,4 +24,4 @@ if [ $1 -eq 'all' ]; then test_all else model_test $1 -fi \ No newline at end of file +fi diff --git a/script/package.ps1 b/script/package.ps1 index 6ab63e16..b41b7c4f 100755 --- a/script/package.ps1 +++ b/script/package.ps1 @@ -11,6 +11,7 @@ cd .. # copy file echo 'copy files ...' cp -r script $package_path +cp resource\prompt.txt $package_path\build cp -r build\Release $package_path\build cp libs\*.dll $package_path\build\Release -cp libs\*.lib $package_path\build\Release \ No newline at end of file +cp libs\*.lib $package_path\build\Release diff --git a/script/package.sh b/script/package.sh index 6059ca76..502e7b48 100755 --- a/script/package.sh +++ b/script/package.sh @@ -16,7 +16,8 @@ cd .. echo 'copy files ...' cp -r script $package_path cp build/*_demo $package_path/build +cp resource/prompt.txt $package_path/build # linux cp libs/*.so build/*.so $package_path/build 2> /dev/null || : # macos -cp libs/*.dylib build/*.dylib $package_path/build 2> /dev/null || : \ No newline at end of file +cp libs/*.dylib build/*.dylib $package_path/build 2> /dev/null || :