mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-18 08:58:59 +02:00
🔧 Re-enable crashpad
This commit is contained in:
parent
1e28efc1b4
commit
a687c6ad42
2 changed files with 10 additions and 2 deletions
8
.github/workflows/pr_build.yml
vendored
8
.github/workflows/pr_build.yml
vendored
|
@ -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
|
||||
|
|
|
@ -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")
|
||||
|
|
Loading…
Reference in a new issue