Skip to content

Commit 22cefc5

Browse files
committed
install libcurl in github workflows
1 parent e9b3d52 commit 22cefc5

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

Diff for: .github/workflows/ci.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
with:
1919
distribution: 'zulu'
2020
java-version: '11'
21+
- name: Install libcurl
22+
run: sudo apt-get install -y libcurl4-openssl-dev
2123
- name: Build libraries
2224
# cmake should figure out OS and ARCH automatically when running build.sh (but we need mvn compile for it)
2325
run: |
@@ -79,10 +81,12 @@ jobs:
7981
with:
8082
distribution: 'zulu'
8183
java-version: '11'
84+
- name: Install libcurl
85+
run: vcpkg install curl
8286
- name: Build libraries
8387
run: |
8488
mvn compile
85-
.github\build.bat -DLLAMA_VERBOSE=ON -DLLAMA_CURL=ON
89+
.github\build.bat -DLLAMA_VERBOSE=ON -DLLAMA_CURL=ON -DCURL_LIBRARY=C:/vcpkg/packages/curl_x64-windows/lib/libcurl.lib -DCURL_INCLUDE_DIR=C:/vcpkg/packages/curl_x64-windows/include
8690
- name: Download model
8791
run: curl -L $env:MODEL_URL --create-dirs -o models/$env:MODEL_NAME
8892
- name: Run tests

Diff for: .github/workflows/release.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v4
21+
- name: Install libcurl
22+
run: sudo apt-get install -y libcurl4-openssl-dev
2123
- name: Build libraries
2224
shell: bash
2325
run: |
@@ -121,10 +123,12 @@ jobs:
121123
}
122124
steps:
123125
- uses: actions/checkout@v4
126+
- name: Install curl
127+
run: vcpkg install curl
124128
- name: Build libraries
125129
shell: cmd
126130
run: |
127-
.github\build.bat ${{ matrix.target.cmake }} -DOS_NAME=${{ matrix.target.os }} -DOS_ARCH=${{ matrix.target.arch }}
131+
.github\build.bat ${{ matrix.target.cmake }} -DOS_NAME=${{ matrix.target.os }} -DOS_ARCH=${{ matrix.target.arch }} -DCURL_LIBRARY=C:/vcpkg/packages/curl_x64-windows/lib/libcurl.lib -DCURL_INCLUDE_DIR=C:/vcpkg/packages/curl_x64-windows/include
128132
- name: Upload artifacts
129133
uses: actions/upload-artifact@v4
130134
with:

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.idea
22
target
33
build
4+
cmake-build-*
45
.DS_Store
56
.directory
67
.vscode

0 commit comments

Comments
 (0)