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

Manually setup correct compiler.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-15 13:05:41 +02:00
parent 5248162123
commit c6cabc7aa1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.cirrus.yml
View File

@ -27,13 +27,13 @@ linux_qt6_task_template: &LINUX_QT6_TASK_TEMPLATE
- which qbs - which qbs
- pwd - pwd
#- ${COMPILER} --version #- ${COMPILER} --version
- ls -l /usr/bin/ | grep -E "${COMPILER_BIN}" - ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}"
- qmake6 --version - qmake6 --version
- qmake6 -query - qmake6 -query
- qbs --version - qbs --version
- qbs setup-toolchains --detect - qbs setup-toolchains /usr/bin/${COMPILER} ${COMPILER}
- qbs setup-qt /usr/bin/qmake6 qt6 - qbs setup-qt /usr/bin/qmake6 qt6
- qbs config profiles.qt6.baseProfile ${TOOLCHAIN} - qbs config profiles.qt6.baseProfile ${COMPILER}
- qbs-config defaultProfile qt6 - qbs-config defaultProfile qt6
- qbs build -f valentina.qbs -d build --command-echo-mode command-line profile:qt6 config:release - qbs build -f valentina.qbs -d build --command-echo-mode command-line profile:qt6 config:release
- xvfb-run -a qbs -p autotest-runner - xvfb-run -a qbs -p autotest-runner
@ -49,7 +49,7 @@ linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
- cd build - cd build
- pwd - pwd
#- ${COMPILER} --version #- ${COMPILER} --version
- ls -l /usr/bin/ | grep -E "${COMPILER_BIN}" - ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}"
- qmake --version - qmake --version
- qmake -query - qmake -query
- qmake ../Valentina.pro -r -spec linux-${COMPILER} CONFIG+=noDebugSymbols CONFIG+=checkWarnings - qmake ../Valentina.pro -r -spec linux-${COMPILER} CONFIG+=noDebugSymbols CONFIG+=checkWarnings
@ -67,7 +67,7 @@ linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE
- which qbs - which qbs
- pwd - pwd
#- ${COMPILER} --version #- ${COMPILER} --version
- ls -l /usr/bin/ | grep -E "${COMPILER_BIN}" - ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}"
- qmake --version - qmake --version
- qbs --version - qbs --version
- qmake -query - qmake -query
@ -147,8 +147,8 @@ task:
image: dismine/clang-ubuntu:latest image: dismine/clang-ubuntu:latest
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
env: env:
COMPILER: clang COMPILER: clang++
COMPILER_BIN: clang COMPILER_REGEX: clang
TOOLCHAIN: clang-16 TOOLCHAIN: clang-16
matrix: matrix:
- name: 'latest Clang [Qt5 QMake]' - name: 'latest Clang [Qt5 QMake]'
@ -170,7 +170,7 @@ task:
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 TOOLCHAIN: x86_64-pc-linux-gnu-gcc-12_2
COMPILER_BIN: "gcc|g\\+\\+" COMPILER_REGEX: "gcc|g\\+\\+"
matrix: matrix:
- name: 'latest GCC [Qt5 QMake]' - name: 'latest GCC [Qt5 QMake]'
<< : *LINUX_QT5_QMAKE_TASK_TEMPLATE << : *LINUX_QT5_QMAKE_TASK_TEMPLATE