From d6209cea4ebc2b4d68258b77591ceaa785fd39fd Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Wed, 24 Jul 2024 16:32:53 +0200 Subject: [PATCH] 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