Skip to content

Commit 21c423e

Browse files
committed
fix path
1 parent 79509cc commit 21c423e

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

.github/actions/windows-setup-curl/action.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ outputs:
99
curl_path:
1010
description: "Path to the downloaded libcurl"
1111
value: ${{ steps.get_libcurl.outputs.curl_path }}
12-
curl_cmake_arg:
13-
description: "Arguments to be added to cmake command which allow finding libcurl"
14-
value: ${{ steps.get_libcurl.outputs.curl_cmake_arg }}
1512

1613
runs:
1714
using: "composite"
@@ -20,10 +17,9 @@ runs:
2017
id: get_libcurl
2118
shell: powershell
2219
env:
23-
CURL_VERSION: 8.6.0_6
20+
CURL_VERSION: ${{ inputs.curl_version }}
2421
run: |
2522
curl.exe -o $env:RUNNER_TEMP/curl.zip -L "https://curl.se/windows/dl-${env:CURL_VERSION}/curl-${env:CURL_VERSION}-win64-mingw.zip"
2623
mkdir $env:RUNNER_TEMP/libcurl
2724
tar.exe -xvf $env:RUNNER_TEMP/curl.zip --strip-components=1 -C $env:RUNNER_TEMP/libcurl
2825
echo "curl_path=$env:RUNNER_TEMP/libcurl" >> $env:GITHUB_OUTPUT
29-
echo "curl_cmake_arg=' -DCURL_LIBRARY=\`"$env:RUNNER_TEMP/libcurl/lib/libcurl.dll.a\`" -DCURL_INCLUDE_DIR=\`"$env:RUNNER_TEMP/libcurl/include\`" '" >> $env:GITHUB_OUTPUT

.github/workflows/server.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ jobs:
197197
- name: Build
198198
id: cmake_build
199199
env:
200-
CURL_CMAKE_ARG: ${{ steps.get_libcurl.outputs.curl_cmake_arg }}
200+
CURL_PATH: ${{ steps.get_libcurl.outputs.curl_path }}
201201
run: |
202-
cmake -B build $env:CURL_CMAKE_ARG
202+
cmake -B build -DCURL_LIBRARY="$env:CURL_PATH/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="$env:CURL_PATH/include"
203203
cmake --build build --config Release -j ${env:NUMBER_OF_PROCESSORS} --target llama-server
204204
205205
- name: Python setup

0 commit comments

Comments
 (0)