fix

netboxlabs · Jan 10, 2025 · 9e1dd63 · 9e1dd63
1 parent 609f2e5
commit 9e1dd63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml
@@ -96,8 +96,9 @@ jobs:
 
 
       - name: Create Conan host profile
+        working-directory: ${{github.workspace}}/src
         run: |
-          cat > "${{github.workspace}}/host" << "EOF"
+          cat > "$(conan config home)/profiles/host" << "EOF"
           [settings]
           os=Linux
           arch=${{matrix.conan_arch}}
@@ -116,7 +117,7 @@ jobs:
       - name: Install dependencies
         working-directory: ${{github.workspace}}/src
         run: |
-          conan install -pr:b=default -pr:h="${{github.workspace}}/host" --build=missing
+          conan install . -pr:b=default -pr:h="host" --build=missing
 
       - name: Configure
         working-directory: ${{github.workspace}}/src/build

diff --git a/conanfile.py b/conanfile.py
@@ -29,8 +29,8 @@ def requirements(self):
         self.requires("robin-hood-hashing/3.11.5")
         self.requires("libcurl/8.11.1")
         if (
-            "libc" in self.settings.compiler.fields
-            and self.settings.compiler.libc != "musl"
+            "libc" not in self.settings.compiler.fields
+            or self.settings.compiler.libc != "musl"
         ):
             self.requires("sentry-crashpad/0.6.5")