Skip to content

Commit 9c10788

Browse files
committedSep 18, 2018
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
1 parent f4e5897 commit 9c10788

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed
 

‎Makefile.in

-5
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,6 @@ default::
240240
@echo "===SCCACHE STATS==="
241241
-$(CCACHE) --show-stats
242242
@echo "==================="
243-
ifndef MOZ_PROFILE_GENERATE
244-
# Ideally we'd do that in the same file as we set the sccache.log location for
245-
# sccache, but it's too late in the build.
246-
-gzip -9 $(DIST)/sccache.log
247-
endif
248243
endif
249244

250245
distclean::

‎build/mozconfig.cache

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ if test -n "$bucket"; then
7575
export CCACHE="$topsrcdir/sccache2/sccache${suffix}"
7676
export SCCACHE_VERBOSE_STATS=1
7777
mk_add_options MOZBUILD_MANAGE_SCCACHE_DAEMON=${topsrcdir}/sccache2/sccache
78-
mk_add_options "UPLOAD_EXTRA_FILES+=sccache.log.gz"
7978
case "$platform" in
8079
win*)
8180
# For now, sccache doesn't support separate PDBs so force debug info to be

‎client.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ build::
8282
# Start a new server, ensuring it gets the jobserver file descriptors
8383
# from make (but don't use the + prefix when make -n is used, so that
8484
# the command doesn't run in that case)
85-
$(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
85+
mkdir -p $(UPLOAD_PATH)
86+
$(if $(findstring n,$(filter-out --%, $(MAKEFLAGS))),,+)env RUST_LOG=sccache=debug SCCACHE_ERROR_LOG=$(UPLOAD_PATH)/sccache.log $(MOZBUILD_MANAGE_SCCACHE_DAEMON) --start-server
8687
endif
8788

8889
####################################

0 commit comments

Comments
 (0)
Failed to load comments.