From ebed64a0ef6b081de0264cc41a3d69d4a25acef2 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Tue, 22 Dec 2020 19:46:47 +0000 Subject: [PATCH] MASTER: Setup ccache configuration That ensures cache size is OK --- master/builds.py | 8 ++++++-- master/ccache.conf | 2 ++ master/config.py.example | 1 - 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 master/ccache.conf diff --git a/master/builds.py b/master/builds.py index 0e8cbac..b948f56 100644 --- a/master/builds.py +++ b/master/builds.py @@ -1,4 +1,6 @@ -import os, sys +import os +import shutil +import sys from buildbot.plugins import util from buildbot.plugins import changes @@ -19,7 +21,9 @@ lock_build = util.WorkerLock("worker", maxCount = 1) # bshomes is used for various build systems (like Gradle) to avoid downloading things at each run # pollers is used by poll modules to maintain their state for data_dir in ["builds", "ccache", "packages", "src", "triggers", "bshomes", "pollers" ]: - os.makedirs(os.path.join(config.buildbot_data_dir, data_dir), exist_ok=True) + os.makedirs(os.path.join(config.buildbot_data_dir, data_dir), exist_ok=True) +shutil.copyfile(os.path.join(config.buildbot_base_dir, "ccache.conf"), + os.path.join(config.buildbot_data_dir, "ccache", "ccache.conf")) class Build: __slots__ = ['name'] diff --git a/master/ccache.conf b/master/ccache.conf new file mode 100644 index 0000000..3a987d5 --- /dev/null +++ b/master/ccache.conf @@ -0,0 +1,2 @@ +max_size = 30.0G +compression = true diff --git a/master/config.py.example b/master/config.py.example index 9090788..ccfdfa1 100644 --- a/master/config.py.example +++ b/master/config.py.example @@ -20,7 +20,6 @@ pb_protocol_port = 9989 # Environment shared by all builds and builders common_env = { "LC_ALL": "C.UTF-8", - "CCACHE_COMPRESS": "1", } # List of platforms enabled