Skip to content

Commit

Permalink
Bug 1783986 - Assume bootstrapped items in MOZ_FETCHES_DIR are always…
Browse files Browse the repository at this point in the history
… up-to-date. r=firefox-build-system-reviewers,andi

Differential Revision: https://phabricator.services.mozilla.com/D154185
  • Loading branch information
glandium committed Aug 10, 2022
1 parent 2260a51 commit 4119f87
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions build/moz.configure/bootstrap.configure
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ def bootstrap_path(path, **kwargs):
@depends(
"--enable-bootstrap",
toolchains_base_dir,
moz_fetches_dir,
bootstrap_toolchain_tasks,
build_environment,
dependable(path),
Expand All @@ -127,7 +128,9 @@ def bootstrap_path(path, **kwargs):
@imports(_from="importlib", _import="import_module")
@imports(_from="__builtin__", _import="open")
@imports(_from="__builtin__", _import="Exception")
def bootstrap_path(bootstrap, toolchains_base_dir, tasks, build_env, path):
def bootstrap_path(
bootstrap, toolchains_base_dir, moz_fetches_dir, tasks, build_env, path
):
if not path:
return
path_parts = path.split("/")
Expand Down Expand Up @@ -160,7 +163,9 @@ def bootstrap_path(path, **kwargs):
with open(index_file) as fh:
index = fh.read().strip()
except Exception:
index = None
# On automation, if there's an artifact in MOZ_FETCHES_DIR, we assume it's
# up-to-date.
index = task_index if moz_fetches_dir else None
if index == task_index and exists:
log.debug("%s is up-to-date", label)
return True
Expand Down

0 comments on commit 4119f87

Please sign in to comment.