diff options
| author |  Sadie Powell | 2023-09-10 09:43:56 +0100 |
|---|---|---|
| committer | Sadie Powell | 2023-09-10 09:43:56 +0100 |
| commit | 2e302768173071b0feb78de42e3b62fa73ea17ea (patch) | |
| tree | 3ad7b76aa8ed3d992ec422f4d03280f88858610e | |
| parent | Try to help users with outdated SSL module configs. (diff) | |
| parent | Update the Windows dependencies. (diff) | |
Merge branch 'insp3' into master.
| -rw-r--r-- | .github/workflows/ci-windows.yml | 2 | ||||
| -rw-r--r-- | win/conanfile.txt | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index d339ef986..76a1e8b2c 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Conan uses: turtlebrowser/get-conan@v1.2 with: - version: 1.60.1 + version: 1.60.2 - name: Install libraries working-directory: ${{ github.workspace }}/win/build diff --git a/win/conanfile.txt b/win/conanfile.txt index 510d4c426..00b69ecc0 100644 --- a/win/conanfile.txt +++ b/win/conanfile.txt @@ -1,4 +1,4 @@ -# Last updated: 2022-07-13 +# Last updated: 2022-09-10 # # Modules we can't legally ship: geo_maxmind, ssl_mbedtls, ssl_openssl # Modules which don't apply to Windows: sslrehashsignal @@ -7,15 +7,16 @@ [requires] argon2/20190702 ## libmaxminddb/1.7.1 -libmysqlclient/8.0.31 -libpq/14.7 +libmysqlclient/8.1.0 +libpq/15.4 libpsl/0.21.1 ## mbedtls/3.2.1 -## openssl/3.1.1 +## openssl/3.1.2 +pcre/8.45 pcre2/10.42 rapidjson/cci.20220822 -re2/20230602 -sqlite3/3.42.0 +re2/20230901 +sqlite3/3.43.0 [options] argon2:shared=True |