diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2017-06-25 11:26:53 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2017-06-25 11:26:53 +0300 |
| commit | 544332cb49c0edd1aa17dbe317a5f2f5ec4c383e (patch) | |
| tree | f3ff55fe8872cfbb8ce70a253825cc5e3283a962 /zephyr-upstream/builders.sh | |
| parent | c2285d63a8141059a15aeb29da2e85757805bb23 (diff) | |
zephyr-upstream: Use ${OUTDIR}/${PLATFORM} for sanitycheck artifacts.
OUTDIR is already per-platform, but it may get contaminated with unrelated
builds e.g. due to bugs in sanitycheck script. It however stores builds in
per-platform named subdirs under its --outdir (${OUTDIR} in our case), so
we use ${OUTDIR}/${PLATFORM} paths in commands which process the artifacts.
Change-Id: Ibfc847f1384e54a1d2ae6cbee6e175bab9879560
Diffstat (limited to 'zephyr-upstream/builders.sh')
| -rwxr-xr-x | zephyr-upstream/builders.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/zephyr-upstream/builders.sh b/zephyr-upstream/builders.sh index 2de2bac50b..0b8286df7c 100755 --- a/zephyr-upstream/builders.sh +++ b/zephyr-upstream/builders.sh @@ -54,15 +54,19 @@ time sanitycheck \ --ccache cd ${WORKSPACE} -find ${OUTDIR} -type f -name '.config' -exec rename 's/.config/zephyr.config/' {} + +# OUTDIR is already per-platform, but it may get contaminated with unrelated +# builds e.g. due to bugs in sanitycheck script. It however stores builds in +# per-platform named subdirs under its --outdir (${OUTDIR} in our case), so +# we use ${OUTDIR}/${PLATFORM} paths below. +find ${OUTDIR}/${PLATFORM} -type f -name '.config' -exec rename 's/.config/zephyr.config/' {} + rsync -avm \ --include=zephyr.bin \ --include=zephyr.config \ --include=zephyr.elf \ --include='*/' \ --exclude='*' \ - ${OUTDIR}/ out/ -find ${OUTDIR} -type f -name 'zephyr.config' -delete + ${OUTDIR}/${PLATFORM} out/ +find ${OUTDIR}/${PLATFORM} -type f -name 'zephyr.config' -delete CCACHE_DIR=${CCACHE_DIR} ccache -M 30G CCACHE_DIR=${CCACHE_DIR} ccache -s |