summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2025-05-08 16:55:59 +0100
committerSadie Powell <sadie@witchery.services>2025-05-08 16:55:59 +0100
commitfbec4d04a519e9b34d9581c08d28be2783d54ce6 (patch)
treed3644b2e5df310311ee23f9912945945d45b282f /.github
parent34582a40ef8f719c7cef45cb80855573b045feb9 (diff)
parent4b15ca02323636521e0c383c83d9678690cf7423 (diff)
Merge branch '2.0' into 2.1.
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ci-windows.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 46acd16e2..3f27a7b48 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -28,7 +28,7 @@ jobs:
- name: Setup Conan
uses: turtlebrowser/get-conan@v1.2
with:
- version: 1.64.0
+ version: 1.66.0
- name: Try to restore libraries from the cache
uses: actions/cache/restore@v4