diff --git a/.cirrus.yml b/.cirrus.yml index c6d929b27..6a6132744 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -182,7 +182,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE - qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6 - qbs-config defaultProfile qt6 - qbs config profiles.qt6.baseProfile clang - - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:'${MACOS_DEPLOYMENT_TARGET}' + - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} - ccache -s deploy_script: - pwd diff --git a/valentina.qbs b/valentina.qbs index 9790a75d5..fe6fd6a1a 100644 --- a/valentina.qbs +++ b/valentina.qbs @@ -13,7 +13,7 @@ Project { conanfilePath: project.sourceDirectory + "/conanfile.py" settings: { if (qbs.targetOS.contains("macos") && project.minimumMacosVersion !== undefined) - return ({"os.version": project.minimumMacosVersion}); + return ({"os.version": project.minimumMacosVersion.toString()}); return undefined; } }