diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index c9ed6fe59..182b2e482 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -113,18 +113,22 @@ jobs: LDFLAGS=${{matrix.ldflags}} EOF - - name: Remove crashpad from conanfile - run: sed -i "/crashpad/d" ${{github.workspace}}/src/conanfile.py + - name: Install dependencies + working-directory: ${{github.workspace}}/src + run: | + conan install -pr:b=default -pr:h="${{github.workspace}}/host" --build=missing - name: Configure working-directory: ${{github.workspace}}/src/build run: | export CC CXX export LDFLAGS=-static + source Release/generators/conanbuild.sh cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake/conan_provider.cmake \ -DCONAN_HOST_PROFILE="${{github.workspace}}/host" \ + -DCONAN_INSTALL_ARGS=--build=never \ -DCRASHPAD_NOT_SUPPORTED=true \ -DCMAKE_C_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" -DCMAKE_CXX_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" \ -DCORRADE_RC_PROGRAM=$(command -v corrade-rc) \ diff --git a/conanfile.py b/conanfile.py index 1021e3a35..b101a38fa 100644 --- a/conanfile.py +++ b/conanfile.py @@ -28,12 +28,13 @@ def requirements(self): self.requires("yaml-cpp/0.8.0") self.requires("robin-hood-hashing/3.11.5") self.requires("libcurl/8.11.1") - self.requires("sentry-crashpad/0.6.5") + self.requires("libevent/2.1.12") + if self.settings.compiler.libc and self.settings.compiler.libc != "musl": + self.requires("sentry-crashpad/0.6.5") def build_requirements(self): self.tool_requires("corrade/2020.06") self.tool_requires("protobuf/5.27.0") - self.tool_requires("ninja/1.12.1") def layout(self): cmake_layout(self)