зеркало из https://github.com/mozilla/gecko-dev.git
bug 1490325 - write sccache log directly to artifact directory, make logs slightly more verbose. r=mshal
This patch makes it so we write the sccache log directly to the artifact directory, so that it will be uploaded even if the build fails. It also makes the log slightly more verbose. Both of these should help with diagnosing sccache failures in CI. The sccache log will no longer be explicitly gzip compressed, but some Taskcluster client implementations will store it as gzip compressed. Differential Revision: https://phabricator.services.mozilla.com/D6187 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
412addf8a0
Коммит
e11506c714
|
@ -240,11 +240,6 @@ default::
|
|||
@echo "===SCCACHE STATS==="
|
||||
-$(CCACHE) --show-stats
|
||||
@echo "==================="
|
||||
ifndef MOZ_PROFILE_GENERATE
|
||||
# Ideally we'd do that in the same file as we set the sccache.log location for
|
||||
# sccache, but it's too late in the build.
|
||||
-gzip -9 $(DIST)/sccache.log
|
||||
endif
|
||||
endif
|
||||
|
||||
distclean::
|
||||
|
|
|
@ -75,7 +75,6 @@ if test -n "$bucket"; then
|
|||
export CCACHE="$topsrcdir/sccache2/sccache${suffix}"
|
||||
export SCCACHE_VERBOSE_STATS=1
|
||||
mk_add_options MOZBUILD_MANAGE_SCCACHE_DAEMON=${topsrcdir}/sccache2/sccache
|
||||
mk_add_options "UPLOAD_EXTRA_FILES+=sccache.log.gz"
|
||||
case "$platform" in
|
||||
win*)
|
||||
# For now, sccache doesn't support separate PDBs so force debug info to be
|
||||
|
|
|
@ -82,7 +82,8 @@ build::
|
|||
# Start a new server, ensuring it gets the jobserver file descriptors
|
||||
# from make (but don't use the + prefix when make -n is used, so that
|
||||
# the command doesn't run in that case)
|
||||
$(if $(findstring n,$(filter-out --%, $(MAKEFLAGS))),,+)env RUST_LOG=sccache::compiler=debug SCCACHE_ERROR_LOG=$(OBJDIR)/dist/sccache.log $(MOZBUILD_MANAGE_SCCACHE_DAEMON) --start-server
|
||||
mkdir -p $(UPLOAD_PATH)
|
||||
$(if $(findstring n,$(filter-out --%, $(MAKEFLAGS))),,+)env RUST_LOG=sccache=debug SCCACHE_ERROR_LOG=$(UPLOAD_PATH)/sccache.log $(MOZBUILD_MANAGE_SCCACHE_DAEMON) --start-server
|
||||
endif
|
||||
|
||||
####################################
|
||||
|
|
Загрузка…
Ссылка в новой задаче