[buildbot] phase1: call host ccache in stats

LEDE Commits lede-commits at lists.infradead.org
Mon May 15 08:39:49 PDT 2023


ynezz pushed a commit to buildbot.git, branch master:
https://git.openwrt.org/f7fcc68b4c4c9add7e773f2646c1caad8e7d155c

commit f7fcc68b4c4c9add7e773f2646c1caad8e7d155c
Author: Thibaut VARÈNE <hacks at slashdirt.org>
AuthorDate: Fri Oct 28 11:05:21 2022 +0200

    phase1: call host ccache in stats
    
    We do not use the staging_dir ccache on buildbots (config seed contains
    CONFIG_CCACHE=n), only the host tool if present.
    Also only execute this step if 'ccache_command' is set.
    
    Signed-off-by: Thibaut VARÈNE <hacks at slashdirt.org>
---
 phase1/master.cfg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/phase1/master.cfg b/phase1/master.cfg
index c3e06e0..15112ce 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -1257,13 +1257,12 @@ for target in targets:
 		name = "ccachestat",
 		description = "Reporting ccache stats",
 		command=["ccache", "-s"],
-		env = MakeEnv(overrides={ 'PATH': ["${PATH}", "./staging_dir/host/bin"] }),
 		logEnviron = False,
 		want_stderr = False,
 		haltOnFailure = False,
 		flunkOnFailure = False,
 		warnOnFailure = False,
-		hideStepIf = lambda r, s: r==results.FAILURE,
+		doStepIf = util.Transform(bool, Property("ccache_command")),
 	))
 
 	for brname in branchNames:




More information about the lede-commits mailing list