From a687c6ad42c4e71d58cf3b847d6af23a3ea0d0cb Mon Sep 17 00:00:00 2001
From: Edgar <Edgar@AnotherFoxGuy.com>
Date: Tue, 4 Mar 2025 12:24:27 +0100
Subject: [PATCH] :wrench: Re-enable crashpad

---
 .github/workflows/pr_build.yml | 8 ++++++++
 conanfile.py                   | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index 36264416ce..9a1ef46b5e 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -180,6 +180,7 @@ jobs:
         fetch-depth: 1
 
     - name: Cache conan
+      id: conan-cache
       uses: actions/cache@v4
       with:
         key: conan-${{ matrix.os }}-${{ hashFiles('conanfile.py') }}
@@ -252,6 +253,13 @@ jobs:
       run: conan cache clean "*" -sbd
       shell: bash
 
+    - name: Save Conan cache
+      if: always() && steps.conan-cache.cache-hit != 'true'
+      uses: actions/cache/save@v4
+      with:
+        key: ${{ steps.conan-cache.outputs.cache-primary-key }}
+        path: ~/.conan2/
+
     - name: Configure CMake
       if: startsWith(matrix.os, 'Windows') == false
       shell: bash
diff --git a/conanfile.py b/conanfile.py
index 4f8b585ef2..a6e2f9160e 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -47,10 +47,10 @@ class Overte(ConanFile):
 
     def requirements(self):
         # self.requires("shaderc/2021.1") # Broken
-        # self.requires("crashpad/cci.20220219") # Broken
         self.requires("artery-font-format/1.0.1")
         self.requires("bullet3/3.25")
         self.requires("cgltf/1.14@overte/stable")
+        self.requires("crashpad/cci.20220219")
         self.requires("discord-rpc/3.4.0@anotherfoxguy/stable")
         self.requires("draco/1.3.5")
         self.requires("etc2comp/cci.20170424")
@@ -67,6 +67,7 @@ class Overte(ConanFile):
         self.requires("openvr/2.2.3@overte/stable")
         self.requires("opus/1.4")
         self.requires("polyvox/0.2.1@overte/stable")
+        self.requires("quazip/1.4")
         self.requires("scribe/2019.02@overte/stable")
         self.requires("sdl/2.30.3")
         self.requires("spirv-cross/cci.20211113")
@@ -87,7 +88,6 @@ class Overte(ConanFile):
             self.requires("qt/5.15.16-2025.01.23@overte/stable", force=True)
             # Upstream NSS is broken, so we use https://github.com/conan-io/conan-center-index/pull/19262/commits/735df499341924901089fd512a8ac56ac83d1e6a
             self.requires("nss/3.107@overte/stable", force=True)
-            self.requires("quazip/1.4")
 
         if self.settings.os == "Windows":
             self.requires("neuron/12.2@overte/prebuild")