Skip to content

Commit 90f8cc5

Browse files
committed
UPD | windows workflow #4
1 parent e11ba70 commit 90f8cc5

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/conan_build_and_test_win.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ jobs:
6262

6363
- name: Conan install dependencies (shared)
6464
if: ${{ matrix.library_type == 'SHARED' }}
65-
# run: conan install . -o "manapihttp/*:shared=False" -o "manapihttp/*:lib=True" -o "manapihttp/*:json_debug=False" -o "manapihttp/*:openssl_dependency=True" -o "manapihttp/*:wolfssl_dependency=False" -o "manapihttp/*:quiche_dependency=False" -o "manapihttp/*:tquic_dependency=False" -o "manapihttp/*:zlib_dependency=True" -o "manapihttp/*:curl_dependency=True" -o "manapihttp/*:gmp_dependency=True" -o "manapihttp/*:zstd_dependency=True" -o "manapihttp/*:brotli_dependency=True" -o "manapihttp/*:grpc_dependency=False" -o "manapihttp/*:nghttp2_dependency=True" -o "manapihttp/*:nghttp3_dependency=True" -o "manapihttp/*:cpptrace_dependency=False" -b=missing
66-
run: conan install . -o "manapihttp/*:shared=True" -o "manapihttp/*:lib=True" -o "manapihttp/*:json_debug=False" -o "manapihttp/*:openssl_dependency=False" -o "manapihttp/*:wolfssl_dependency=False" -o "manapihttp/*:quiche_dependency=False" -o "manapihttp/*:tquic_dependency=False" -o "manapihttp/*:zlib_dependency=False" -o "manapihttp/*:curl_dependency=False" -o "manapihttp/*:gmp_dependency=False" -o "manapihttp/*:zstd_dependency=False" -o "manapihttp/*:brotli_dependency=False" -o "manapihttp/*:grpc_dependency=False" -o "manapihttp/*:nghttp2_dependency=False" -o "manapihttp/*:nghttp3_dependency=False" -o "manapihttp/*:cpptrace_dependency=False" -b=missing
65+
run: conan install . -o "manapihttp/*:shared=False" -o "manapihttp/*:lib=True" -o "manapihttp/*:json_debug=False" -o "manapihttp/*:openssl_dependency=True" -o "manapihttp/*:wolfssl_dependency=False" -o "manapihttp/*:quiche_dependency=False" -o "manapihttp/*:tquic_dependency=False" -o "manapihttp/*:zlib_dependency=True" -o "manapihttp/*:curl_dependency=True" -o "manapihttp/*:gmp_dependency=True" -o "manapihttp/*:zstd_dependency=True" -o "manapihttp/*:brotli_dependency=True" -o "manapihttp/*:grpc_dependency=False" -o "manapihttp/*:nghttp2_dependency=True" -o "manapihttp/*:nghttp3_dependency=True" -o "manapihttp/*:cpptrace_dependency=False" -b=missing
66+
# run: conan install . -o "manapihttp/*:shared=True" -o "manapihttp/*:lib=True" -o "manapihttp/*:json_debug=False" -o "manapihttp/*:openssl_dependency=False" -o "manapihttp/*:wolfssl_dependency=False" -o "manapihttp/*:quiche_dependency=False" -o "manapihttp/*:tquic_dependency=False" -o "manapihttp/*:zlib_dependency=False" -o "manapihttp/*:curl_dependency=False" -o "manapihttp/*:gmp_dependency=False" -o "manapihttp/*:zstd_dependency=False" -o "manapihttp/*:brotli_dependency=False" -o "manapihttp/*:grpc_dependency=False" -o "manapihttp/*:nghttp2_dependency=False" -o "manapihttp/*:nghttp3_dependency=False" -o "manapihttp/*:cpptrace_dependency=False" -b=missing
6767

6868
- name: Conan install dependencies (static)
6969
if: ${{ matrix.library_type == 'STATIC' }}
70-
# run: conan install . -o "manapihttp/*:shared=True" -o "manapihttp/*:lib=True" -o "manapihttp/*:json_debug=False" -o "manapihttp/*:openssl_dependency=True" -o "manapihttp/*:wolfssl_dependency=False" -o "manapihttp/*:quiche_dependency=False" -o "manapihttp/*:tquic_dependency=False" -o "manapihttp/*:zlib_dependency=True" -o "manapihttp/*:curl_dependency=True" -o "manapihttp/*:gmp_dependency=True" -o "manapihttp/*:zstd_dependency=True" -o "manapihttp/*:brotli_dependency=True" -o "manapihttp/*:grpc_dependency=False" -o "manapihttp/*:nghttp2_dependency=True" -o "manapihttp/*:nghttp3_dependency=True" -o "manapihttp/*:cpptrace_dependency=False" -b=missing
71-
run: conan install . -o "manapihttp/*:shared=True" -o "manapihttp/*:lib=True" -o "manapihttp/*:json_debug=False" -o "manapihttp/*:openssl_dependency=False" -o "manapihttp/*:wolfssl_dependency=False" -o "manapihttp/*:quiche_dependency=False" -o "manapihttp/*:tquic_dependency=False" -o "manapihttp/*:zlib_dependency=False" -o "manapihttp/*:curl_dependency=False" -o "manapihttp/*:gmp_dependency=False" -o "manapihttp/*:zstd_dependency=False" -o "manapihttp/*:brotli_dependency=False" -o "manapihttp/*:grpc_dependency=False" -o "manapihttp/*:nghttp2_dependency=False" -o "manapihttp/*:nghttp3_dependency=False" -o "manapihttp/*:cpptrace_dependency=False" -b=missing
70+
run: conan install . -o "manapihttp/*:shared=True" -o "manapihttp/*:lib=True" -o "manapihttp/*:json_debug=False" -o "manapihttp/*:openssl_dependency=True" -o "manapihttp/*:wolfssl_dependency=False" -o "manapihttp/*:quiche_dependency=False" -o "manapihttp/*:tquic_dependency=False" -o "manapihttp/*:zlib_dependency=True" -o "manapihttp/*:curl_dependency=True" -o "manapihttp/*:gmp_dependency=True" -o "manapihttp/*:zstd_dependency=True" -o "manapihttp/*:brotli_dependency=True" -o "manapihttp/*:grpc_dependency=False" -o "manapihttp/*:nghttp2_dependency=True" -o "manapihttp/*:nghttp3_dependency=True" -o "manapihttp/*:cpptrace_dependency=False" -b=missing
71+
# run: conan install . -o "manapihttp/*:shared=True" -o "manapihttp/*:lib=True" -o "manapihttp/*:json_debug=False" -o "manapihttp/*:openssl_dependency=False" -o "manapihttp/*:wolfssl_dependency=False" -o "manapihttp/*:quiche_dependency=False" -o "manapihttp/*:tquic_dependency=False" -o "manapihttp/*:zlib_dependency=False" -o "manapihttp/*:curl_dependency=False" -o "manapihttp/*:gmp_dependency=False" -o "manapihttp/*:zstd_dependency=False" -o "manapihttp/*:brotli_dependency=False" -o "manapihttp/*:grpc_dependency=False" -o "manapihttp/*:nghttp2_dependency=False" -o "manapihttp/*:nghttp3_dependency=False" -o "manapihttp/*:cpptrace_dependency=False" -b=missing
7272

7373
- name: Clean up
7474
run: conan cache clean "*/*"

src/ManapiEventLoop.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,9 @@ manapi::sys_error::status_or<std::shared_ptr<manapi::event_loop>> manapi::event_
818818
}
819819

820820
manapi::event_loop::~event_loop() {
821+
#if MANAPIHTTP_CURL_DEPENDENCY
821822
this->curl_watcher->curl_multi.reset();
823+
#endif
822824
this->etaskpool_.reset();
823825
this->mx.reset();
824826
}

0 commit comments

Comments
 (0)