mirror
/
mongo
mirror of https://github.com/mongodb/mongo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SERVER-93200 fix windows incremental builds (#26297) 

GitOrigin-RevId: c8bf78533cd740cd89ff62d06872e53c2da780a6
This commit is contained in:
Daniel Moody 2024-08-20 14:03:13 -05:00 committed by MongoDB Bot
parent 65370454e9
commit 554901cea9
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
WORKSPACE.bazel
View File

@ -69,16 +69,16 @@ hedron_compile_commands_setup_transitive_transitive_transitive()
http_archive( http_archive(
name = "rules_python", name = "rules_python",
sha256 = "8c8fe44ef0a9afc256d1e75ad5f448bb59b81aba149b8958f02f7b3a98f5d9b4", sha256 = "be04b635c7be4604be1ef20542e9870af3c49778ce841ee2d92fcb42f9d9516a",
strip_prefix = "rules_python-0.13.0", strip_prefix = "rules_python-0.35.0",
urls = [ urls = [
# Implements retry by relisting each url multiple times to be used as a failover. # Implements retry by relisting each url multiple times to be used as a failover.
# TODO(SERVER-86719): Re-implement http_archive to allow sleeping between retries # TODO(SERVER-86719): Re-implement http_archive to allow sleeping between retries
"https://github.com/bazelbuild/rules_python/archive/refs/tags/0.13.0.tar.gz", "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.35.0.tar.gz",
"https://github.com/bazelbuild/rules_python/archive/refs/tags/0.13.0.tar.gz", "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.35.0.tar.gz",
"https://github.com/bazelbuild/rules_python/archive/refs/tags/0.13.0.tar.gz", "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.35.0.tar.gz",
"https://github.com/bazelbuild/rules_python/archive/refs/tags/0.13.0.tar.gz", "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.35.0.tar.gz",
"https://github.com/bazelbuild/rules_python/archive/refs/tags/0.13.0.tar.gz", "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.35.0.tar.gz",
], ],
) )
@ -121,16 +121,16 @@ http_archive(
# Poetry rules for managing Python dependencies # Poetry rules for managing Python dependencies
http_archive( http_archive(
name = "rules_poetry", name = "rules_poetry",
sha256 = "59b6f654885059465880d641dbf45a1babad512c6ae7347b01ad03eebd615e0a", sha256 = "5db24c0eacb42ef8b25019bd000a9d2905fba71682d1dac51603bfbc0e6fa5c9",
strip_prefix = "rules_poetry-fc645faf7fb2e7f6c8fce968801e2a63dc1332bb", strip_prefix = "rules_poetry-29b93f4f2e227834ac8d5b48cb0baef8dbeeecc7",
urls = [ urls = [
# Implements retry by relisting each url multiple times to be used as a failover. # Implements retry by relisting each url multiple times to be used as a failover.
# TODO(SERVER-86719): Re-implement http_archive to allow sleeping between retries # TODO(SERVER-86719): Re-implement http_archive to allow sleeping between retries
"https://github.com/mongodb-forks/rules_poetry/archive/fc645faf7fb2e7f6c8fce968801e2a63dc1332bb.tar.gz", "https://github.com/mongodb-forks/rules_poetry/archive/29b93f4f2e227834ac8d5b48cb0baef8dbeeecc7.tar.gz",
"https://github.com/mongodb-forks/rules_poetry/archive/fc645faf7fb2e7f6c8fce968801e2a63dc1332bb.tar.gz", "https://github.com/mongodb-forks/rules_poetry/archive/29b93f4f2e227834ac8d5b48cb0baef8dbeeecc7.tar.gz",
"https://github.com/mongodb-forks/rules_poetry/archive/fc645faf7fb2e7f6c8fce968801e2a63dc1332bb.tar.gz", "https://github.com/mongodb-forks/rules_poetry/archive/29b93f4f2e227834ac8d5b48cb0baef8dbeeecc7.tar.gz",
"https://github.com/mongodb-forks/rules_poetry/archive/fc645faf7fb2e7f6c8fce968801e2a63dc1332bb.tar.gz", "https://github.com/mongodb-forks/rules_poetry/archive/29b93f4f2e227834ac8d5b48cb0baef8dbeeecc7.tar.gz",
"https://github.com/mongodb-forks/rules_poetry/archive/fc645faf7fb2e7f6c8fce968801e2a63dc1332bb.tar.gz", "https://github.com/mongodb-forks/rules_poetry/archive/29b93f4f2e227834ac8d5b48cb0baef8dbeeecc7.tar.gz",
], ],
) )

6
bazel/config/render_template.bzl
View File

@ -4,9 +4,9 @@ def render_template_impl(ctx):
python_path = [] python_path = []
for py_dep in ctx.attr.python_libs: for py_dep in ctx.attr.python_libs:
for dep in py_dep[PyInfo].transitive_sources.to_list(): for path in py_dep[PyInfo].imports.to_list():
if dep.path not in python_path: if path not in python_path:
python_path.append(dep.path) python_path.append(ctx.expand_make_variables("python_library_imports", "$(BINDIR)/external/" + path, ctx.var))
expanded_args = [ expanded_args = [
ctx.expand_make_variables("render_template_expand", ctx.expand_location(arg, ctx.attr.srcs), ctx.var) ctx.expand_make_variables("render_template_expand", ctx.expand_location(arg, ctx.attr.srcs), ctx.var)

7
bazel/mongo_src_rules.bzl
View File

@ -1518,9 +1518,10 @@ def idl_generator_impl(ctx):
# path so all modules can be found by the toolchain. # path so all modules can be found by the toolchain.
python_path = [] python_path = []
for py_dep in ctx.attr.py_deps: for py_dep in ctx.attr.py_deps:
for dep in py_dep[PyInfo].transitive_sources.to_list(): for path in py_dep[PyInfo].imports.to_list():
if dep.path not in python_path: if path not in python_path:
python_path.append(dep.path) python_path.append(ctx.expand_make_variables("python_library_imports", "$(BINDIR)/external/" + path, ctx.var))
py_depsets = [py_dep[PyInfo].transitive_sources for py_dep in ctx.attr.py_deps] py_depsets = [py_dep[PyInfo].transitive_sources for py_dep in ctx.attr.py_deps]
inputs = depset(transitive = [ inputs = depset(transitive = [