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

Use new image for GCC.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-15 16:20:13 +02:00
parent db077cddef
commit 84ff119eae
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.cirrus.yml
View File

@ -19,7 +19,7 @@ regular_task_template: &REGULER_TASK_TEMPLATE
linux_qt6_task_template: &LINUX_QT6_TASK_TEMPLATE linux_qt6_task_template: &LINUX_QT6_TASK_TEMPLATE
install_script: install_script:
- bash -c "$PACKAGE_MANAGER_INSTALL -y qbs qt6-base-dev qt6-l10n-tools libqt6svg6-dev qt6-base-dev-tools qmake6 qbs libxerces-c-dev poppler-utils xvfb ccache" - bash -c "$PACKAGE_MANAGER_INSTALL -y qbs qt6-base-dev qt6-l10n-tools libqt6svg6-dev qt6-base-dev-tools qmake6 qbs libxerces-c-dev poppler-utils libgl1-mesa-dev"
build_script: build_script:
- uname -a - uname -a
- echo $PATH - echo $PATH
@ -34,13 +34,12 @@ linux_qt6_task_template: &LINUX_QT6_TASK_TEMPLATE
- qbs setup-qt /usr/bin/qmake6 qt6 - qbs setup-qt /usr/bin/qmake6 qt6
- qbs config profiles.qt6.baseProfile ${COMPILER} - qbs config profiles.qt6.baseProfile ${COMPILER}
- qbs-config defaultProfile qt6 - qbs-config defaultProfile qt6
- qbs config --list profiles
- 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
linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
install_script: install_script:
- bash -c "$PACKAGE_MANAGER_INSTALL qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils xvfb ccache" - bash -c "$PACKAGE_MANAGER_INSTALL qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils"
build_script: build_script:
- uname -a - uname -a
- echo $PATH - echo $PATH
@ -51,7 +50,6 @@ linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
- ${COMPILER} --version - ${COMPILER} --version
- ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}" - ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}"
- qmake --version - qmake --version
- qmake -query
- qmake ../Valentina.pro -r -spec linux-${COMPILER} CONFIG+=noDebugSymbols CONFIG+=checkWarnings - qmake ../Valentina.pro -r -spec linux-${COMPILER} 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"
@ -59,7 +57,7 @@ linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE
install_script: install_script:
- bash -c "$PACKAGE_MANAGER_INSTALL qbs qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils xvfb ccache" - bash -c "$PACKAGE_MANAGER_INSTALL qbs qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils"
build_script: build_script:
- uname -a - uname -a
- echo $PATH - echo $PATH
@ -70,7 +68,6 @@ linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE
- ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}" - ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}"
- qmake --version - qmake --version
- qbs --version - qbs --version
- qmake -query
- qbs setup-toolchains /usr/bin/${COMPILER} ${COMPILER} - qbs setup-toolchains /usr/bin/${COMPILER} ${COMPILER}
- qbs setup-qt /usr/bin/qmake qt5 - qbs setup-qt /usr/bin/qmake qt5
- qbs-config defaultProfile qt5 - qbs-config defaultProfile qt5
@ -163,7 +160,7 @@ task:
env: env:
QT_SELECT: "qt6" QT_SELECT: "qt6"
- container: - container:
image: eeks99/gcc-ubuntu:latest image: dismine/gcc-ubuntu:latest
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
@ -178,7 +175,7 @@ task:
<< : *LINUX_QT5_QBS_TASK_TEMPLATE << : *LINUX_QT5_QBS_TASK_TEMPLATE
env: env:
QT_SELECT: "qt5" QT_SELECT: "qt5"
- name: 'latest Clang [Qt6]' - name: 'latest GCC [Qt6]'
<< : *LINUX_QT6_TASK_TEMPLATE << : *LINUX_QT6_TASK_TEMPLATE
env: env:
QT_SELECT: "qt6" QT_SELECT: "qt6"