aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-24 21:32:45 +02:00
parent 78fd3574b6
commit ce0abdeb21
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.cirrus.yml
View File

@ -163,6 +163,9 @@ macos_task_template: &MACOS_TASK_TEMPLATE
pip_cache: pip_cache:
folder: ${PIP_CACHE_DIR} folder: ${PIP_CACHE_DIR}
install_script: install_script:
- clang --version
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
- sudo xcode-select -p
- brew update > /dev/null - brew update > /dev/null
- brew install --force qt6 coreutils ccache conan qbs cmake - brew install --force qt6 coreutils ccache conan qbs cmake
- chmod -R 755 /opt/homebrew/opt/qt6/* - chmod -R 755 /opt/homebrew/opt/qt6/*
@ -170,7 +173,6 @@ macos_task_template: &MACOS_TASK_TEMPLATE
- pip3 install --user --upgrade pip dropbox - pip3 install --user --upgrade pip dropbox
- ccache --set-config=sloppiness=pch_defines,time_macros - ccache --set-config=sloppiness=pch_defines,time_macros
- conan --version - conan --version
- clang --version
- qmake --version - qmake --version
- which qmake - which qmake
- qbs --version - qbs --version
@ -183,7 +185,6 @@ macos_task_template: &MACOS_TASK_TEMPLATE
- qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6 - qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6
- qbs-config defaultProfile qt6 - qbs-config defaultProfile qt6
- qbs config profiles.qt6.baseProfile clang - qbs config profiles.qt6.baseProfile clang
- echo 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} modules.buildconfig.enableCcache:${ENABLE_CCACHE} - 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} modules.buildconfig.enableCcache:${ENABLE_CCACHE}
- ccache -s - ccache -s
deploy_script: deploy_script:

2
appveyor.yml
View File

@ -344,6 +344,7 @@ for:
- qbs-setup-qt %QTDIR%\bin\qmake.exe qt6 - qbs-setup-qt %QTDIR%\bin\qmake.exe qt6
- qbs-config defaultProfile qt6 - qbs-config defaultProfile qt6
- dir "C:\Qt\Tools" - dir "C:\Qt\Tools"
- conan config home
- type %HOMEPATH%\.conan2\settings.yml - type %HOMEPATH%\.conan2\settings.yml
- conan profile new valentina - conan profile new valentina
- ps: | - ps: |
@ -495,6 +496,7 @@ for:
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app - sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
- sudo xcode-select -p - sudo xcode-select -p
- brew update > /dev/null - brew update > /dev/null
- rm '/usr/local/bin/ccmake'
- brew install --force coreutils qbs cmake - brew install --force coreutils qbs cmake
- | - |
if [[ "$ENABLE_CONAN" == "true" ]]; then if [[ "$ENABLE_CONAN" == "true" ]]; then