From 7c50a13ac69d4bbd04fa052c3423f52cf53cd3bc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 25 Mar 2024 15:56:16 +0200 Subject: [PATCH] Fix conan profile. --- .cirrus.yml | 6 +++--- appveyor.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 572e5875c..7035a72ff 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -355,7 +355,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE # This won't display anything secret. - security find-identity -v -p codesigning - brew update > /dev/null - - brew install qt6 coreutils ccache qbs cmake ninja git openssl@1.1 pkg-config poppler xerces-c pipx + - brew install qt6 coreutils ccache qbs cmake ninja git openssl@1.1 pkg-config poppler xerces-c - brew outdated - brew upgrade qt6 - pipx ensurepath @@ -363,7 +363,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH" - echo $PATH - python3 --version - - pipx install pip dropbox py7zr 'urllib3<2.0' conan==1.63.0 requests + - pip3 install --user --upgrade pip dropbox py7zr 'urllib3<2.0' conan==1.63.0 requests - ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE" - qmake --version - which qmake @@ -384,7 +384,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE - conan profile new valentina - conan profile update settings.build_type=Release valentina - conan profile update settings.os=Macos valentina - - conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina + - conan profile update settings.os.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina - conan profile update settings.compiler=clang valentina - conan profile update settings.compiler.cppstd=17 valentina - conan profile update settings.compiler.libcxx=libstdc++11 valentina diff --git a/appveyor.yml b/appveyor.yml index 2047571a1..39af403f5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -683,7 +683,7 @@ for: - conan profile new valentina - conan profile update settings.build_type=Release valentina - conan profile update settings.os=Macos valentina - - conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina + - conan profile update settings.os.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina - conan profile update settings.os.os_build=Macos valentina - conan profile update settings.os.arch=x86_64 valentina - conan profile update settings.os.arch_build=x86_64 valentina @@ -882,7 +882,7 @@ for: - conan profile new valentina - conan profile update settings.build_type=Release valentina - conan profile update settings.os=Macos valentina - - conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina + - conan profile update settings.os.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina - conan profile update settings.os_build=Macos valentina - conan profile update settings.os.arch=x86_64 valentina - conan profile update settings.os.arch_build=x86_64 valentina