From bc3ad1ba6dc567242cc2da483f600c5d1bb04e73 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Mon, 23 Dec 2024 15:21:37 +0000
Subject: Update the Windows dependencies.

---
 .github/workflows/ci-windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github')

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index bea63d8bc..e467cf542 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.63.0
+          version: 1.66.0
 
       - name: Install libraries
         working-directory: ${{ github.workspace }}/win/build
-- 
cgit v1.3.1-10-gc9f91


From ab87955de3a5ebfc3a47dcac8f3e467dd9482fc1 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Mon, 23 Dec 2024 15:32:07 +0000
Subject: Silence a compiler error on Alpine.

---
 .github/workflows/ci-alpine.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github')

diff --git a/.github/workflows/ci-alpine.yml b/.github/workflows/ci-alpine.yml
index 70cfd5001..5132a0277 100644
--- a/.github/workflows/ci-alpine.yml
+++ b/.github/workflows/ci-alpine.yml
@@ -10,7 +10,7 @@ jobs:
     container: alpine:edge
     runs-on: ubuntu-latest
     env:
-      CXXFLAGS: -std=${{ matrix.standard }} -Wno-error=variadic-macros
+      CXXFLAGS: -std=${{ matrix.standard }} -Wno-error=non-virtual-dtor -Wno-error=variadic-macros
       TEST_BUILD_MODULES: argon2 geo_maxmind ldap mysql pgsql regex_pcre regex_pcre2 regex_posix regex_re2 regex_stdlib regex_tre sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal
     steps:
       - uses: actions/checkout@v4
-- 
cgit v1.3.1-10-gc9f91