Switch back to GCC 13 for Qt5 QMake.
This commit is contained in:
parent
01ce780548
commit
2ebb0aee2c
24
.cirrus.yml
24
.cirrus.yml
|
@ -54,8 +54,6 @@ linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
|
||||||
- pwd
|
- pwd
|
||||||
- ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}"
|
- ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}"
|
||||||
- ${COMPILER} --version
|
- ${COMPILER} --version
|
||||||
- find / -name 'libstdc++.so.6' || true
|
|
||||||
- strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep '^CXXABI_'
|
|
||||||
- ccache --set-config max_size="$CCACHE_SIZE"
|
- ccache --set-config max_size="$CCACHE_SIZE"
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- qmake ../Valentina.pro -r -spec ${QMAKE_SPEC} CONFIG+=noDebugSymbols CONFIG+=checkWarnings
|
- qmake ../Valentina.pro -r -spec ${QMAKE_SPEC} CONFIG+=noDebugSymbols CONFIG+=checkWarnings
|
||||||
|
@ -127,6 +125,21 @@ linux_task:
|
||||||
container:
|
container:
|
||||||
cpu: 8
|
cpu: 8
|
||||||
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
|
||||||
|
- container:
|
||||||
|
image: dismine/gcc-ubuntu:13
|
||||||
|
env:
|
||||||
|
COMPILER: gcc
|
||||||
|
QMAKE_SPEC: "linux-g++"
|
||||||
|
GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
|
||||||
|
COMPILER_REGEX: "gcc|g\\+\\+"
|
||||||
|
matrix:
|
||||||
|
- name: 'GCC 13 [Qt5 QMake]'
|
||||||
|
<< : *LINUX_QT5_QMAKE_TASK_TEMPLATE
|
||||||
|
env:
|
||||||
|
QT_SELECT: "qt5"
|
||||||
|
container:
|
||||||
|
cpu: 2
|
||||||
|
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
||||||
- container:
|
- container:
|
||||||
image: dismine/gcc-ubuntu:latest
|
image: dismine/gcc-ubuntu:latest
|
||||||
env:
|
env:
|
||||||
|
@ -135,13 +148,6 @@ linux_task:
|
||||||
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:
|
||||||
- name: 'latest GCC [Qt5 QMake]'
|
|
||||||
<< : *LINUX_QT5_QMAKE_TASK_TEMPLATE
|
|
||||||
env:
|
|
||||||
QT_SELECT: "qt5"
|
|
||||||
container:
|
|
||||||
cpu: 2
|
|
||||||
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
|
||||||
- name: 'latest GCC [Qt5 QBS]'
|
- name: 'latest GCC [Qt5 QBS]'
|
||||||
<< : *LINUX_QT5_QBS_TASK_TEMPLATE
|
<< : *LINUX_QT5_QBS_TASK_TEMPLATE
|
||||||
env:
|
env:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user