Explicitly define qmake spec name.
This commit is contained in:
parent
dfcfea88b6
commit
839d654798
|
@ -50,7 +50,7 @@ linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
|
||||||
- ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}"
|
- ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}"
|
||||||
- ${COMPILER} --version
|
- ${COMPILER} --version
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- qmake ../Valentina.pro -r -spec linux-${COMPILER} CONFIG+=noDebugSymbols CONFIG+=checkWarnings
|
- qmake ../Valentina.pro -r -spec ${QMAKE_SPEC} CONFIG+=noDebugSymbols CONFIG+=checkWarnings
|
||||||
- make -j$(nproc)
|
- make -j$(nproc)
|
||||||
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$CIRRUS_WORKING_DIR/build/src/libs/vpropertyexplorer/bin:$CIRRUS_WORKING_DIR/build/src/libs/qmuparser/bin"
|
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$CIRRUS_WORKING_DIR/build/src/libs/vpropertyexplorer/bin:$CIRRUS_WORKING_DIR/build/src/libs/qmuparser/bin"
|
||||||
- xvfb-run -a make --silent check TESTARGS="-silent"
|
- xvfb-run -a make --silent check TESTARGS="-silent"
|
||||||
|
@ -145,6 +145,7 @@ task:
|
||||||
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
|
||||||
|
QMAKE_SPEC: "linux-clang"
|
||||||
COMPILER_REGEX: clang
|
COMPILER_REGEX: clang
|
||||||
matrix:
|
matrix:
|
||||||
- name: 'latest Clang [Qt5 QMake]'
|
- name: 'latest Clang [Qt5 QMake]'
|
||||||
|
@ -164,6 +165,7 @@ task:
|
||||||
memory: 16G # Set to 16GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
memory: 16G # Set to 16GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
||||||
env:
|
env:
|
||||||
COMPILER: gcc
|
COMPILER: gcc
|
||||||
|
QMAKE_SPEC: "linux-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'
|
||||||
COMPILER_REGEX: "gcc|g\\+\\+"
|
COMPILER_REGEX: "gcc|g\\+\\+"
|
||||||
matrix:
|
matrix:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user