|
32 | 32 | uses: actions/checkout@v3
|
33 | 33 |
|
34 | 34 | - name: Install dependencies
|
35 |
| - run: choco install --no-progress -y openssl |
| 35 | + run: vcpkg install openssl --triplet x64-windows |
36 | 36 |
|
37 | 37 | - name: Setup Boost
|
38 | 38 | run: python3 tools/ci.py setup-boost --source-dir=$(pwd)
|
@@ -106,13 +106,13 @@ jobs:
|
106 | 106 | - { toolset: msvc-14.2, os: windows-2019 }
|
107 | 107 | - { toolset: msvc-14.3, os: windows-2022 }
|
108 | 108 | env:
|
109 |
| - OPENSSL_ROOT: "C:\\Program Files\\OpenSSL" |
| 109 | + OPENSSL_ROOT: "C:\\vcpkg\\installed\\x64-windows" |
110 | 110 | steps:
|
111 | 111 | - name: Checkout
|
112 | 112 | uses: actions/checkout@v3
|
113 | 113 |
|
114 | 114 | - name: Install dependencies
|
115 |
| - run: choco install --no-progress -y openssl |
| 115 | + run: vcpkg install openssl --triplet x64-windows |
116 | 116 |
|
117 | 117 | - name: Setup user-config.jam
|
118 | 118 | run: cp tools/user-config.jam "${HOMEDRIVE}${HOMEPATH}/"
|
@@ -216,7 +216,7 @@ jobs:
|
216 | 216 | matrix:
|
217 | 217 | include:
|
218 | 218 | - { toolset: gcc-11, install: g++-11, cxxstd: "11,17,20" } # Having C++11 shouldn't break the build
|
219 |
| - - { toolset: clang-14, install: clang-11, cxxstd: "17,20" } |
| 219 | + - { toolset: clang-14, install: clang-14, cxxstd: "17,20" } |
220 | 220 | runs-on: ubuntu-22.04
|
221 | 221 | steps:
|
222 | 222 | - name: Checkout
|
|
0 commit comments