From ec7b5b8b076ba7c913d90b93d2573acaec4faf12 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Wed, 24 Jul 2024 16:14:11 +0200 Subject: [PATCH 1/3] boost 1.85.0 Signed-off-by: Uilian Ries --- conanfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.txt b/conanfile.txt index ac97c94..4fb62cf 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,5 @@ [requires] -boost/1.82.0 +boost/1.85.0 [generators] CMakeDeps From 3eeac9fa9c18c0e67a65ba3ddb8efe74cf72dbe7 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Wed, 24 Jul 2024 16:23:39 +0200 Subject: [PATCH 2/3] Pass settings via cli Signed-off-by: Uilian Ries --- .github/workflows/build.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 641b554..3cfddbe 100644 --- 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 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 @@ -157,7 +155,7 @@ jobs: CMakeLists.txt /usr/local/Cellar key: ${{ github.sha }}-${{ github.run_id }} - + - name: 'Download jextract' id: jextract uses: oracle-actions/setup-java@v1 From d6209cea4ebc2b4d68258b77591ceaa785fd39fd Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Wed, 24 Jul 2024 16:32:53 +0200 Subject: [PATCH 3/3] use default profile for Linux Signed-off-by: Uilian Ries --- .github/conan2/linux_default | 12 ------------ .github/conan2/macos_default | 16 ---------------- .github/workflows/build.yml | 10 ++++------ 3 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 .github/conan2/linux_default delete mode 100644 .github/conan2/macos_default diff --git a/.github/conan2/linux_default b/.github/conan2/linux_default deleted file mode 100644 index e0de6f0..0000000 --- a/.github/conan2/linux_default +++ /dev/null @@ -1,12 +0,0 @@ -[settings] -arch=x86_64 -build_type=Release -compiler=gcc -compiler.version=11 -compiler.cppstd=gnu17 -compiler.libcxx=libstdc++11 -os=Linux - -[buildenv] -CC=/usr/bin/clang -CXX=/usr/bin/clang++ diff --git a/.github/conan2/macos_default b/.github/conan2/macos_default deleted file mode 100644 index f04d59a..0000000 --- a/.github/conan2/macos_default +++ /dev/null @@ -1,16 +0,0 @@ -[settings] -arch=x86_64 -build_type=Release -compiler=apple-clang -compiler.cppstd=gnu17 -compiler.libcxx=libc++ -compiler.version=14 -os=Macos - -[buildenv] -CC=/usr/bin/clang -CXX=/usr/bin/clang++ - -[options] -boost/*:with_stacktrace_backtrace=False -boost/*:without_locale=True diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3cfddbe..a8e1589 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: run: | conan profile detect conan version - conan profile show + conan profile show -pr default mkdir -p libs - name: compile x86_64 @@ -108,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 . @@ -206,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