diff --git a/.github/workflows/build.yml b/.github/workflows/_build.yml.disabled similarity index 100% rename from .github/workflows/build.yml rename to .github/workflows/_build.yml.disabled diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index 6c9b5132276fe..401bc839d6ed5 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -199,7 +199,7 @@ jobs: env: CURL_PATH: ${{ steps.get_libcurl.outputs.curl_path }} run: | - cmake -B build -DCURL_LIBRARY="$env:CURL_PATH/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="$env:CURL_PATH/include" + cmake -B build -DCURL_LIBRARY="$env:CURL_PATH/lib/libcurl.a" -DCURL_INCLUDE_DIR="$env:CURL_PATH/include" cmake --build build --config Release -j ${env:NUMBER_OF_PROCESSORS} --target llama-server - name: Python setup @@ -213,13 +213,6 @@ jobs: run: | pip install -r examples/server/tests/requirements.txt - - name: Copy Libcurl - id: prepare_libcurl - env: - CURL_PATH: ${{ steps.get_libcurl.outputs.curl_path }} - run: | - cp $env:CURL_PATH/bin/libcurl-x64.dll ./build/bin/Release/libcurl-x64.dll - - name: Tests id: server_integration_tests if: ${{ !matrix.disabled_on_pr || !github.event.pull_request }} diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 43533fc86abe2..5364bd7810af2 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -85,6 +85,8 @@ set(LLAMA_COMMON_EXTRA_LIBS build_info) # Use curl to download model url if (LLAMA_CURL) + set(CURL_STATICLIB ON) + set(CURL_USE_STATIC_LIBS TRUE) find_package(CURL) if (NOT CURL_FOUND) message(FATAL_ERROR "Could NOT find CURL. Hint: to disable this feature, set -DLLAMA_CURL=OFF")