From: Thibaut VARÈNE <hacks@slashdirt.org>
Date: Fri, 28 Oct 2022 09:05:21 +0000 (+0200)
Subject: phase1: call host ccache in stats
X-Git-Tag: v2~6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f7fcc68b4c4c9add7e773f2646c1caad8e7d155c;p=buildbot.git

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@slashdirt.org>
---

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: