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

Specify toolchain name directly.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-14 19:49:03 +02:00
parent d726f7206f
commit 02781040ed
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.cirrus.yml
View File

@ -35,13 +35,13 @@ linux_qt6_task_template: &LINUX_QT6_TASK_TEMPLATE
- which qmake - which qmake
- which qbs - which qbs
- pwd - pwd
- ${COMPILER} --version #- ${COMPILER} --version
- qbs --version - qbs --version
- qbs setup-toolchains --detect - qbs setup-toolchains --detect
#- qbs setup-qt /usr/bin/qmake qt6 - qbs setup-qt /usr/bin/qmake qt6
#- qbs config profiles.qt6.baseProfile ${COMPILER} - qbs config profiles.qt6.baseProfile ${TOOLCHAIN}
#- qbs-config defaultProfile qt6 - qbs-config defaultProfile qt6
- qbs build -f valentina.qbs -d build --command-echo-mode command-line config:release - qbs build -f valentina.qbs -d build --command-echo-mode command-line profile:qt5 config:release
- xvfb-run -a qbs -p autotest-runner - xvfb-run -a qbs -p autotest-runner
linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
@ -79,7 +79,7 @@ linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE
- qbs setup-toolchains --detect - qbs setup-toolchains --detect
- qbs setup-qt /usr/bin/qmake qt5 - qbs setup-qt /usr/bin/qmake qt5
- qbs-config defaultProfile qt5 - qbs-config defaultProfile qt5
- qbs config profiles.qt5.baseProfile ${COMPILER} - qbs config profiles.qt5.baseProfile ${TOOLCHAIN}
- qbs build -f valentina.qbs -d build --command-echo-mode command-line profile:qt5 config:release - qbs build -f valentina.qbs -d build --command-echo-mode command-line profile:qt5 config:release
- xvfb-run -a qbs -p autotest-runner - xvfb-run -a qbs -p autotest-runner
@ -149,6 +149,7 @@ task:
env: env:
COMPILER: g++ COMPILER: g++
GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
TOOLCHAIN: x86_64-pc-linux-gnu-gcc-12_2
task: task:
name: 'latest GCC [Qt5 QBS]' name: 'latest GCC [Qt5 QBS]'
@ -159,6 +160,7 @@ task:
env: env:
COMPILER: gcc COMPILER: gcc
GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
TOOLCHAIN: x86_64-pc-linux-gnu-gcc-12_2
task: task:
name: 'latest GCC [Qt6]' name: 'latest GCC [Qt6]'
@ -169,6 +171,7 @@ task:
env: env:
COMPILER: gcc COMPILER: gcc
GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
TOOLCHAIN: x86_64-pc-linux-gnu-gcc-12_2
task: task:
name: 'latest Clang [Qt5 QMake]' name: 'latest Clang [Qt5 QMake]'
@ -178,6 +181,7 @@ task:
<< : *LINUX_QT5_QMAKE_TASK_TEMPLATE << : *LINUX_QT5_QMAKE_TASK_TEMPLATE
env: env:
COMPILER: clang COMPILER: clang
TOOLCHAIN: clang
task: task:
name: 'latest Clang [Qt5 QBS]' name: 'latest Clang [Qt5 QBS]'
@ -187,6 +191,7 @@ task:
<< : *LINUX_QT5_QBS_TASK_TEMPLATE << : *LINUX_QT5_QBS_TASK_TEMPLATE
env: env:
COMPILER: clang COMPILER: clang
TOOLCHAIN: clang
task: task:
name: 'latest Clang [Qt6]' name: 'latest Clang [Qt6]'
@ -196,3 +201,4 @@ task:
<< : *LINUX_QT6_TASK_TEMPLATE << : *LINUX_QT6_TASK_TEMPLATE
env: env:
COMPILER: clang COMPILER: clang
TOOLCHAIN: clang