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

Ccache should also work on mac os.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2021-09-25 08:42:27 +03:00
parent fc30957b85
commit 3b07b6ad09
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.cirrus.yml
View File

@ -1,10 +1,10 @@
### Global defaults ### Global defaults
env: env:
PACKAGE_MANAGER_INSTALL: "apt-get -qq update && apt-get install -y"
CCACHE_SIZE: "200M" CCACHE_SIZE: "200M"
CCACHE_DIR: "/tmp/ccache_dir" CCACHE_DIR: "/tmp/ccache_dir"
CCACHE_NOHASHDIR: "1" # Debug info might contain a stale path if the build dir changes, but this is fine CCACHE_NOHASHDIR: "1" # Debug info might contain a stale path if the build dir changes, but this is fine
CCACHE_CPP2: "yes"
### Task templates ### Task templates
@ -12,10 +12,15 @@ env:
filter_template: &FILTER_TEMPLATE filter_template: &FILTER_TEMPLATE
skip: "!changesInclude('.cirrus.yml', '**.{h,cpp,c,pro,pri,ts,ui,png}')" skip: "!changesInclude('.cirrus.yml', '**.{h,cpp,c,pro,pri,ts,ui,png}')"
linux_task_template: &LINUX_TASK_TEMPLATE regular_task_template: &REGULER_TASK_TEMPLATE
<< : *FILTER_TEMPLATE << : *FILTER_TEMPLATE
ccache_cache: ccache_cache:
folder: "/tmp/ccache_dir" folder: "/tmp/ccache_dir"
linux_task_template: &LINUX_TASK_TEMPLATE
<< : *REGULER_TASK_TEMPLATE
env:
PACKAGE_MANAGER_INSTALL: "apt-get -qq update && apt-get install -y"
container: container:
cpu: 4 cpu: 4
memory: 8G memory: 8G
@ -35,7 +40,7 @@ linux_task_template: &LINUX_TASK_TEMPLATE
- xvfb-run -a make --silent check TESTARGS="-silent" - xvfb-run -a make --silent check TESTARGS="-silent"
macos_task_template: &MACOS_TASK_TEMPLATE macos_task_template: &MACOS_TASK_TEMPLATE
<< : *FILTER_TEMPLATE << : *REGULER_TASK_TEMPLATE
timeout_in: 120m timeout_in: 120m
env: env:
ACCESS_TOKEN: ENCRYPTED[81e0b2381ffb628b73f5c94f834010e6631191e0ad03cdd0850d440fb2737a74b68131d842030f010c1bf73ab4cdc1ae] ACCESS_TOKEN: ENCRYPTED[81e0b2381ffb628b73f5c94f834010e6631191e0ad03cdd0850d440fb2737a74b68131d842030f010c1bf73ab4cdc1ae]
@ -50,7 +55,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
folder: ${PIP_CACHE_DIR} folder: ${PIP_CACHE_DIR}
install_script: install_script:
- brew update > /dev/null - brew update > /dev/null
- brew install qt5 coreutils - brew install qt5 coreutils ccache
- chmod -R 755 /usr/local/opt/qt5/* - chmod -R 755 /usr/local/opt/qt5/*
- python3 --version - python3 --version
- pip3 install --user --upgrade pip dropbox - pip3 install --user --upgrade pip dropbox
@ -64,7 +69,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
- cd build - cd build
- pwd - pwd
- qmake --version - qmake --version
- QT_SELECT=qt5 qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=checkWarnings CONFIG+=noTests - QT_SELECT=qt5 qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=checkWarnings CONFIG+=noTests
- ${COMPILER} --version - ${COMPILER} --version
- make -j$(nproc) - make -j$(nproc)
deploy_script: deploy_script:

5
common.pri
View File

@ -147,11 +147,6 @@ win32 {
DEFINES += QT_NO_FOREACH DEFINES += QT_NO_FOREACH
macx{
# QTBUG-31034 qmake doesn't allow override QMAKE_CXX
CONFIG+=no_ccache
}
CONFIG(release, debug|release){ CONFIG(release, debug|release){
!noDebugSymbols:win32:!*msvc*{ !noDebugSymbols:win32:!*msvc*{
unset(QMAKE_STRIP) unset(QMAKE_STRIP)