зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1362164 - Remove mozharness code to print ccache stats; r=ted
I was going to inline "enable_ccache" into buildbase.py because AFAICT its value is effectively "if not windows." However, I realized that all this is doing is dumping ccache stats (something the build system itself is in a better position to do because it actually knows if ccache is enabled). Then I realized we don't use ccache directly any more in automation because we use sccache (or at least that's the way it should be). Since there's no need for this ccache code in mozharness, this commit deletes it. If we want it back, we can add the functionality to `mach build`. MozReview-Commit-ID: BrRi1QKe5l3 --HG-- extra : rebase_source : 0e25f372dcdd0cc6ef571bcee5cba675104cd7a4 extra : source : 5e04c49d2d10ad48b19cddaf28fee845dc6e8629
This commit is contained in:
Родитель
81ce358a3e
Коммит
8952f10bbe
|
@ -49,7 +49,6 @@ config = {
|
|||
'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/adjust-sdk-beta.token',
|
||||
'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
|
||||
],
|
||||
'enable_ccache': True,
|
||||
'vcs_share_base': '/builds/hg-shared',
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': ["/builds/tooltool.py"],
|
||||
|
|
|
@ -58,7 +58,6 @@ config = {
|
|||
'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/adjust-sdk-beta.token',
|
||||
'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
|
||||
],
|
||||
'enable_ccache': True,
|
||||
'vcs_share_base': '/builds/hg-shared',
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': ["/builds/tooltool.py"],
|
||||
|
|
|
@ -57,7 +57,6 @@ config = {
|
|||
'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/adjust-sdk-beta.token',
|
||||
'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
|
||||
],
|
||||
'enable_ccache': True,
|
||||
'vcs_share_base': '/builds/hg-shared',
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': ["/builds/tooltool.py"],
|
||||
|
|
|
@ -24,7 +24,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': True,
|
||||
'vcs_share_base': '/builds/hg-shared',
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': ["/builds/tooltool.py"],
|
||||
|
|
|
@ -29,7 +29,6 @@ config = {
|
|||
'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
|
||||
'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
|
||||
],
|
||||
'enable_ccache': True,
|
||||
'enable_check_test': False,
|
||||
'vcs_share_base': '/builds/hg-shared',
|
||||
'objdir': 'obj-firefox/',
|
||||
|
|
|
@ -35,7 +35,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': 'C:/builds/hg-shared',
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [sys.executable,
|
||||
|
|
|
@ -35,7 +35,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': 'C:/builds/hg-shared',
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [sys.executable,
|
||||
|
|
|
@ -24,7 +24,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': False,
|
||||
'enable_ccache': True,
|
||||
'vcs_share_base': '/builds/hg-shared',
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': ["/builds/tooltool.py"],
|
||||
|
|
|
@ -26,7 +26,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': False,
|
||||
'enable_ccache': True,
|
||||
'vcs_share_base': '/builds/hg-shared',
|
||||
'objdir': MOZ_OBJDIR,
|
||||
'tooltool_script': ["/builds/tooltool.py"],
|
||||
|
|
|
@ -26,7 +26,6 @@ config = {
|
|||
'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
|
||||
'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
|
||||
],
|
||||
'enable_ccache': True,
|
||||
'vcs_share_base': '/builds/hg-shared',
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': ["/builds/tooltool.py"],
|
||||
|
|
|
@ -18,7 +18,6 @@ config = {
|
|||
"buildbot": "/tools/buildbot/bin/buildbot",
|
||||
},
|
||||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
'enable_ccache': True,
|
||||
'vcs_share_base': '/builds/hg-shared',
|
||||
'objdir': MOZ_OBJDIR,
|
||||
'tooltool_script': ["/builds/tooltool.py"],
|
||||
|
|
|
@ -17,7 +17,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': False,
|
||||
'enable_ccache': True,
|
||||
'vcs_share_base': '/builds/hg-shared',
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': ["/builds/tooltool.py"],
|
||||
|
|
|
@ -17,7 +17,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': False,
|
||||
'enable_ccache': True,
|
||||
'vcs_share_base': '/builds/hg-shared',
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': ["/builds/tooltool.py"],
|
||||
|
|
|
@ -20,7 +20,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': False,
|
||||
'enable_ccache': True,
|
||||
'vcs_share_base': '/builds/hg-shared',
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': ["/builds/tooltool.py"],
|
||||
|
|
|
@ -22,7 +22,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': False,
|
||||
'enable_ccache': True,
|
||||
'vcs_share_base': '/builds/hg-shared',
|
||||
'objdir': MOZ_OBJDIR,
|
||||
# debug specific
|
||||
|
|
|
@ -32,7 +32,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -32,7 +32,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -33,7 +33,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -33,7 +33,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -32,7 +32,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -32,7 +32,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -32,7 +32,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -32,7 +32,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -28,7 +28,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -28,7 +28,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -33,7 +33,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': False,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -33,7 +33,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -33,7 +33,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -34,7 +34,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': False,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -33,7 +33,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -33,7 +33,6 @@ config = {
|
|||
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
|
||||
# decides whether we want to use moz_sign_cmd in env
|
||||
'enable_signing': True,
|
||||
'enable_ccache': False,
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
'objdir': 'obj-firefox',
|
||||
'tooltool_script': [
|
||||
|
|
|
@ -1037,21 +1037,6 @@ or run without that action (ie: --no-{action})"
|
|||
|
||||
return post_upload_cmd
|
||||
|
||||
def _ccache_z(self):
|
||||
"""clear ccache stats."""
|
||||
dirs = self.query_abs_dirs()
|
||||
env = self.query_build_env()
|
||||
self.run_command(command=['ccache', '-z'],
|
||||
cwd=dirs['base_work_dir'],
|
||||
env=env)
|
||||
|
||||
def _ccache_s(self):
|
||||
"""print ccache stats. only done for unix like platforms"""
|
||||
dirs = self.query_abs_dirs()
|
||||
env = self.query_build_env()
|
||||
cmd = ['ccache', '-s']
|
||||
self.run_command(cmd, cwd=dirs['abs_src_dir'], env=env)
|
||||
|
||||
def _rm_old_package(self):
|
||||
"""rm the old package."""
|
||||
c = self.config
|
||||
|
@ -1600,9 +1585,6 @@ or run without that action (ie: --no-{action})"
|
|||
|
||||
def preflight_build(self):
|
||||
"""set up machine state for a complete build."""
|
||||
c = self.config
|
||||
if c.get('enable_ccache'):
|
||||
self._ccache_z()
|
||||
if not self.query_is_nightly():
|
||||
# the old package should live in source dir so we don't need to do
|
||||
# this for nighties since we clobber the whole work_dir in
|
||||
|
@ -1746,9 +1728,6 @@ or run without that action (ie: --no-{action})"
|
|||
"""grabs properties from post build and calls ccache -s"""
|
||||
self.generate_build_props(console_output=console_output,
|
||||
halt_on_failure=True)
|
||||
if self.config.get('enable_ccache'):
|
||||
self._ccache_s()
|
||||
|
||||
# A list of argument lists. Better names gratefully accepted!
|
||||
mach_commands = self.config.get('postflight_build_mach_commands', [])
|
||||
for mach_command in mach_commands:
|
||||
|
|
Загрузка…
Ссылка в новой задаче