build botan on win

an-tao · Jun 16, 2024 · 5363650 · 5363650
1 parent 1f3780d
commit 5363650
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/windows-msvc.yml b/.github/workflows/windows-msvc.yml
@@ -16,9 +16,7 @@ jobs:
         link: [ 'STATIC', 'SHARED' ]
         # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
         build-type: ['Debug', 'Release']
-        # TODO: conan botan is v2, v2 support is removed
-        # tls-provider: ['', 'openssl', 'botan']
-        tls-provider: ['', 'openssl']
+        tls-provider: ['', 'openssl', 'botan']
 
     steps:
       - name: Checkout Trantor source code
@@ -38,6 +36,9 @@ jobs:
           pip install conan
           conan profile detect --force
           conan install .. --output-folder=. --build=missing --settings=build_type=${{matrix.build-type}} --settings=compiler="msvc"
+          if [[ ${{ matrix.tls-provider }} != "" ]]; then
+            conan install ${{matrix.tls-provider}} --output-folder=. --build=missing --settings=build_type=${{matrix.build-type}} --settings=compiler="msvc"
+          fi
 
       - name: Create Build Environment & Configure Cmake
         shell: bash

diff --git a/conanfile.txt b/conanfile.txt
@@ -1,6 +1,5 @@
 [requires]
 gtest/1.10.0
-openssl/1.1.1t
 #c-ares/1.17.1
 spdlog/1.12.0