Skip to content

Commit 7412b37

Browse files
committed
choco => vcpkg
1 parent 60ba5b6 commit 7412b37

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/checkout@v3
3333

3434
- name: Install dependencies
35-
run: choco install --no-progress -y openssl
35+
run: vcpkg install openssl --triplet x64-windows
3636

3737
- name: Setup Boost
3838
run: python3 tools/ci.py setup-boost --source-dir=$(pwd)
@@ -106,13 +106,13 @@ jobs:
106106
- { toolset: msvc-14.2, os: windows-2019 }
107107
- { toolset: msvc-14.3, os: windows-2022 }
108108
env:
109-
OPENSSL_ROOT: "C:\\Program Files\\OpenSSL"
109+
OPENSSL_ROOT: "C:\\vcpkg\\installed\\x64-windows"
110110
steps:
111111
- name: Checkout
112112
uses: actions/checkout@v3
113113

114114
- name: Install dependencies
115-
run: choco install --no-progress -y openssl
115+
run: vcpkg install openssl --triplet x64-windows
116116

117117
- name: Setup user-config.jam
118118
run: cp tools/user-config.jam "${HOMEDRIVE}${HOMEPATH}/"
@@ -216,7 +216,7 @@ jobs:
216216
matrix:
217217
include:
218218
- { 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" }
220220
runs-on: ubuntu-22.04
221221
steps:
222222
- name: Checkout

.github/workflows/coverage.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Coverage
22

3-
on: push
4-
# push:
5-
# branches:
6-
# - develop
3+
on:
4+
push:
5+
branches:
6+
- develop
77

88
jobs:
99
posix:

0 commit comments

Comments
 (0)