Merge remote-tracking branch 'upstream/master' into develop

celestiamobile · May 9, 2024 · 6fa42b0 · 6fa42b0
2 parents aff3205 + de99a2b
commit 6fa42b0
Show file tree

Hide file tree

Showing 3 changed files with 164 additions and 243 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Update vcpkg
       shell: pwsh
       run: |
-        $vcpkgCommit = 'a13163bfa5d7b4c814d8c929443874f676c4482c'
+        $vcpkgCommit = '326d8b43e365352ba3ccadf388d989082fe0f2a6'
         pushd "$env:VCPKG_INSTALLATION_ROOT"
         git cat-file -e "${vcpkgCommit}^{commit}" 2> $null
         if (!$?) {