Merge pull request #28 from uilianries/hotfix/ci-conan

[ci] Honor default profile according to the system
denismakogon · Jul 25, 2024 · 0e1e6a2 · 0e1e6a2
2 parents 3870912 + d6209ce
commit 0e1e6a2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 40 deletions.
diff --git a/.github/conan2/linux_default b/.github/conan2/linux_default
diff --git a/.github/conan2/macos_default b/.github/conan2/macos_default
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,15 +41,13 @@ jobs:
         run: |
           conan profile detect
           conan version
-          cp .github/conan2/macos_default ~/.conan2/profiles/default
-          conan profile show
+          conan profile show -pr default
           mkdir -p libs
-          mkdir -p build
 
       - name: compile x86_64
         shell: bash
         run: |
-          conan install . --output-folder=build --build=missing 
+          conan install conanfile.txt --output-folder=build --build=missing -s:h arch=x86_64
           cd build
           cp ../toolchains/macos-x86_64.cmake conan_toolchain.cmake
           LIB_SUFFIX="-macos-x86_64" cmake ..  -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
@@ -61,7 +59,7 @@ jobs:
       - name: compile aarch64
         shell: bash
         run: |
-          conan install . --output-folder=build --build=missing
+          conan install conanfile.txt --output-folder=build --build=missing
           cd build
           cp ../toolchains/macos-aarch64.cmake conan_toolchain.cmake
           LIB_SUFFIX="-macos-aarch64" cmake .. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
@@ -110,15 +108,14 @@ jobs:
         run: |
           conan profile detect
           conan version
-          cp .github/conan2/linux_default ~/.conan2/profiles/default
-          conan profile show
+          conan profile show -pr default
           mkdir -p libs
           mkdir -p build
 
       - name: compile x86_64
         shell: bash
         run: |
-          conan install . --output-folder=build --build=missing
+          conan install . --output-folder=build --build=missing -s:h arch=x86_64
           cd build
           LIB_SUFFIX="-linux-x86_64" cmake ..  -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
           cmake --build .
@@ -157,7 +154,7 @@ jobs:
             CMakeLists.txt
             /usr/local/Cellar
           key: ${{ github.sha }}-${{ github.run_id }}
-  
+
       - name: 'Download jextract'
         id: jextract
         uses: oracle-actions/setup-java@v1
@@ -208,8 +205,7 @@ jobs:
         run: |
           conan profile detect
           conan version
-          cp .github/conan2/${{ matrix.TARGET }}_default ~/.conan2/profiles/default
-          conan profile show
+          conan profile show -pr default
 
       - name: conan-install
         shell: bash

diff --git a/conanfile.txt b/conanfile.txt
@@ -1,5 +1,5 @@
 [requires]
-boost/1.82.0
+boost/1.85.0
 
 [generators]
 CMakeDeps