SERVER-103043 Fix missing bin/mongo_crypt_v1.dylib (#34347)
GitOrigin-RevId: 521ab39666e6e2a62f921beffd22b782aec0d9e9
This commit is contained in:
Andrew Bradshaw
MongoDB Bot
parent
0520b1e823
commit
ee4f2fe4a2
@ -224,6 +224,9 @@ filegroup(
|
||||
}) + select({
|
||||
"//bazel/config:build_enterprise_windows_enabled": ["//src/mongo/db/modules/enterprise/distsrc:windows_notices"],
|
||||
"//conditions:default": [],
|
||||
}) + select({
|
||||
"@platforms//os:macos": ["//etc:mac_plist"],
|
||||
"//conditions:default": [],
|
||||
}),
|
||||
)
|
||||
|
||||
|
||||
@ -72,7 +72,7 @@ single_version_override(
|
||||
version = "1.7.1",
|
||||
)
|
||||
|
||||
bazel_dep(name = "rules_pkg", version = "0.9.1")
|
||||
bazel_dep(name = "rules_pkg", version = "1.0.1")
|
||||
bazel_dep(name = "zlib", version = "1.3.1")
|
||||
single_version_override(
|
||||
module_name = "zlib",
|
||||
|
||||
100
MODULE.bazel.lock
generated
100
MODULE.bazel.lock
generated
@ -31,7 +31,6 @@
|
||||
"https://bcr.bazel.build/modules/rules_jvm_external/5.2/MODULE.bazel": "d9351ba35217ad0de03816ef3ed63f89d411349353077348a45348b096615036",
|
||||
"https://bcr.bazel.build/modules/rules_jvm_external/5.2/source.json": "10572111995bc349ce31c78f74b3c147f6b3233975c7fa5eff9211f6db0d34d9",
|
||||
"https://bcr.bazel.build/modules/rules_license/0.0.3/MODULE.bazel": "627e9ab0247f7d1e05736b59dbb1b6871373de5ad31c3011880b4133cafd4bd0",
|
||||
"https://bcr.bazel.build/modules/rules_license/0.0.4/MODULE.bazel": "6a88dd22800cf1f9f79ba32cacad0d3a423ed28efa2c2ed5582eaa78dd3ac1e5",
|
||||
"https://bcr.bazel.build/modules/rules_license/0.0.7/MODULE.bazel": "088fbeb0b6a419005b89cf93fe62d9517c0a2b8bb56af3244af65ecfe37e7d5d",
|
||||
"https://bcr.bazel.build/modules/rules_license/0.0.7/source.json": "355cc5737a0f294e560d52b1b7a6492d4fff2caf0bef1a315df5a298fca2d34a",
|
||||
"https://bcr.bazel.build/modules/rules_multirun/0.9.0/MODULE.bazel": "32d628ef586b5b23f67e55886b7bc38913ea4160420d66ae90521dda2ff37df0",
|
||||
@ -39,15 +38,16 @@
|
||||
"https://bcr.bazel.build/modules/rules_nodejs/6.3.0/MODULE.bazel": "45345e4aba35dd6e4701c1eebf5a4e67af4ed708def9ebcdc6027585b34ee52d",
|
||||
"https://bcr.bazel.build/modules/rules_nodejs/6.3.0/source.json": "1254ffd8d0d908a19c67add7fb5e2a1f604df133bc5d206425264293e2e537fc",
|
||||
"https://bcr.bazel.build/modules/rules_pkg/0.7.0/MODULE.bazel": "df99f03fc7934a4737122518bb87e667e62d780b610910f0447665a7e2be62dc",
|
||||
"https://bcr.bazel.build/modules/rules_pkg/0.9.1/MODULE.bazel": "af00144208c4be503bc920d043ba3284fb37385b3f6160b4a4daf4df80b4b823",
|
||||
"https://bcr.bazel.build/modules/rules_pkg/0.9.1/source.json": "c00cf34b4cfe88fce80245f8ce8532360f787dad9f21462e9b470796d14ffe10",
|
||||
"https://bcr.bazel.build/modules/rules_pkg/1.0.1/MODULE.bazel": "5b1df97dbc29623bccdf2b0dcd0f5cb08e2f2c9050aab1092fd39a41e82686ff",
|
||||
"https://bcr.bazel.build/modules/rules_pkg/1.0.1/source.json": "bd82e5d7b9ce2d31e380dd9f50c111d678c3bdaca190cb76b0e1c71b05e1ba8a",
|
||||
"https://bcr.bazel.build/modules/rules_proto/4.0.0/MODULE.bazel": "a7a7b6ce9bee418c1a760b3d84f83a299ad6952f9903c67f19e4edd964894e06",
|
||||
"https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/MODULE.bazel": "e8dff86b0971688790ae75528fe1813f71809b5afd57facb44dad9e8eca631b7",
|
||||
"https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/source.json": "d57902c052424dfda0e71646cb12668d39c4620ee0544294d9d941e7d12bc3a9",
|
||||
"https://bcr.bazel.build/modules/rules_python/0.10.2/MODULE.bazel": "cc82bc96f2997baa545ab3ce73f196d040ffb8756fd2d66125a530031cd90e5f",
|
||||
"https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel": "26114f0c0b5e93018c0c066d6673f1a2c3737c7e90af95eff30cfee38d0bbac7",
|
||||
"https://bcr.bazel.build/modules/rules_python/0.27.1/MODULE.bazel": "65dc875cc1a06c30d5bbdba7ab021fd9e551a6579e408a3943a61303e2228a53",
|
||||
"https://bcr.bazel.build/modules/rules_python/0.27.1/source.json": "88980dfdcf0651a11344cad2ab1f962ea1b0e51edc80ebbae274c8fa9cde78f4",
|
||||
"https://bcr.bazel.build/modules/rules_python/0.31.0/MODULE.bazel": "93a43dc47ee570e6ec9f5779b2e64c1476a6ce921c48cc9a1678a91dd5f8fd58",
|
||||
"https://bcr.bazel.build/modules/rules_python/0.31.0/source.json": "a41c836d4065888eef4377f2f27b6eea0fedb9b5adb1bab1970437373fe90dc7",
|
||||
"https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c",
|
||||
"https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c",
|
||||
"https://bcr.bazel.build/modules/stardoc/0.6.2/MODULE.bazel": "7060193196395f5dd668eda046ccbeacebfd98efc77fed418dbe2b82ffaa39fd",
|
||||
@ -579,23 +579,25 @@
|
||||
},
|
||||
"@@rules_python~//python/extensions:python.bzl%python": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "8xJ0jM3WgMi72Jm08RQVHV/jw+3x+XgcEcvyyIE8pVM=",
|
||||
"usagesDigest": "9yxaL2+zBXfFPR16t0JPSoraRa7kBnEVNSyx17cmttU=",
|
||||
"bzlTransitiveDigest": "8vDKUdCc6qEk2/YsFiPsFO1Jqgl+XPFRklapOxMAbE8=",
|
||||
"usagesDigest": "abUgYqI1bdv/jc3Xu7C2SbT7mmtxAziRT/kUCFERO+A=",
|
||||
"recordedFileInputs": {},
|
||||
"recordedDirentsInputs": {},
|
||||
"envVariables": {},
|
||||
"envVariables": {
|
||||
"RULES_PYTHON_BZLMOD_DEBUG": null
|
||||
},
|
||||
"generatedRepoSpecs": {
|
||||
"python_3_11_aarch64-apple-darwin": {
|
||||
"bzlFile": "@@rules_python~//python:repositories.bzl",
|
||||
"ruleClassName": "python_repository",
|
||||
"attributes": {
|
||||
"sha256": "916c35125b5d8323a21526d7a9154ca626453f63d0878e95b9f613a95006c990",
|
||||
"sha256": "b042c966920cf8465385ca3522986b12d745151a72c060991088977ca36d3883",
|
||||
"patches": [],
|
||||
"platform": "aarch64-apple-darwin",
|
||||
"python_version": "3.11.6",
|
||||
"release_filename": "20231002/cpython-3.11.6+20231002-aarch64-apple-darwin-install_only.tar.gz",
|
||||
"python_version": "3.11.7",
|
||||
"release_filename": "20240107/cpython-3.11.7+20240107-aarch64-apple-darwin-install_only.tar.gz",
|
||||
"urls": [
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-aarch64-apple-darwin-install_only.tar.gz"
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.11.7+20240107-aarch64-apple-darwin-install_only.tar.gz"
|
||||
],
|
||||
"distutils_content": "",
|
||||
"strip_prefix": "python",
|
||||
@ -607,13 +609,13 @@
|
||||
"bzlFile": "@@rules_python~//python:repositories.bzl",
|
||||
"ruleClassName": "python_repository",
|
||||
"attributes": {
|
||||
"sha256": "3e26a672df17708c4dc928475a5974c3fb3a34a9b45c65fb4bd1e50504cc84ec",
|
||||
"sha256": "b102eaf865eb715aa98a8a2ef19037b6cc3ae7dfd4a632802650f29de635aa13",
|
||||
"patches": [],
|
||||
"platform": "aarch64-unknown-linux-gnu",
|
||||
"python_version": "3.11.6",
|
||||
"release_filename": "20231002/cpython-3.11.6+20231002-aarch64-unknown-linux-gnu-install_only.tar.gz",
|
||||
"python_version": "3.11.7",
|
||||
"release_filename": "20240107/cpython-3.11.7+20240107-aarch64-unknown-linux-gnu-install_only.tar.gz",
|
||||
"urls": [
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-aarch64-unknown-linux-gnu-install_only.tar.gz"
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.11.7+20240107-aarch64-unknown-linux-gnu-install_only.tar.gz"
|
||||
],
|
||||
"distutils_content": "",
|
||||
"strip_prefix": "python",
|
||||
@ -625,13 +627,13 @@
|
||||
"bzlFile": "@@rules_python~//python:repositories.bzl",
|
||||
"ruleClassName": "python_repository",
|
||||
"attributes": {
|
||||
"sha256": "7937035f690a624dba4d014ffd20c342e843dd46f89b0b0a1e5726b85deb8eaf",
|
||||
"sha256": "b44e1b74afe75c7b19143413632c4386708ae229117f8f950c2094e9681d34c7",
|
||||
"patches": [],
|
||||
"platform": "ppc64le-unknown-linux-gnu",
|
||||
"python_version": "3.11.6",
|
||||
"release_filename": "20231002/cpython-3.11.6+20231002-ppc64le-unknown-linux-gnu-install_only.tar.gz",
|
||||
"python_version": "3.11.7",
|
||||
"release_filename": "20240107/cpython-3.11.7+20240107-ppc64le-unknown-linux-gnu-install_only.tar.gz",
|
||||
"urls": [
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-ppc64le-unknown-linux-gnu-install_only.tar.gz"
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.11.7+20240107-ppc64le-unknown-linux-gnu-install_only.tar.gz"
|
||||
],
|
||||
"distutils_content": "",
|
||||
"strip_prefix": "python",
|
||||
@ -643,13 +645,13 @@
|
||||
"bzlFile": "@@rules_python~//python:repositories.bzl",
|
||||
"ruleClassName": "python_repository",
|
||||
"attributes": {
|
||||
"sha256": "f9f19823dba3209cedc4647b00f46ed0177242917db20fb7fb539970e384531c",
|
||||
"sha256": "49520e3ff494708020f306e30b0964f079170be83e956be4504f850557378a22",
|
||||
"patches": [],
|
||||
"platform": "s390x-unknown-linux-gnu",
|
||||
"python_version": "3.11.6",
|
||||
"release_filename": "20231002/cpython-3.11.6+20231002-s390x-unknown-linux-gnu-install_only.tar.gz",
|
||||
"python_version": "3.11.7",
|
||||
"release_filename": "20240107/cpython-3.11.7+20240107-s390x-unknown-linux-gnu-install_only.tar.gz",
|
||||
"urls": [
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-s390x-unknown-linux-gnu-install_only.tar.gz"
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.11.7+20240107-s390x-unknown-linux-gnu-install_only.tar.gz"
|
||||
],
|
||||
"distutils_content": "",
|
||||
"strip_prefix": "python",
|
||||
@ -661,13 +663,13 @@
|
||||
"bzlFile": "@@rules_python~//python:repositories.bzl",
|
||||
"ruleClassName": "python_repository",
|
||||
"attributes": {
|
||||
"sha256": "178cb1716c2abc25cb56ae915096c1a083e60abeba57af001996e8bc6ce1a371",
|
||||
"sha256": "a0e615eef1fafdc742da0008425a9030b7ea68a4ae4e73ac557ef27b112836d4",
|
||||
"patches": [],
|
||||
"platform": "x86_64-apple-darwin",
|
||||
"python_version": "3.11.6",
|
||||
"release_filename": "20231002/cpython-3.11.6+20231002-x86_64-apple-darwin-install_only.tar.gz",
|
||||
"python_version": "3.11.7",
|
||||
"release_filename": "20240107/cpython-3.11.7+20240107-x86_64-apple-darwin-install_only.tar.gz",
|
||||
"urls": [
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-x86_64-apple-darwin-install_only.tar.gz"
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.11.7+20240107-x86_64-apple-darwin-install_only.tar.gz"
|
||||
],
|
||||
"distutils_content": "",
|
||||
"strip_prefix": "python",
|
||||
@ -679,13 +681,13 @@
|
||||
"bzlFile": "@@rules_python~//python:repositories.bzl",
|
||||
"ruleClassName": "python_repository",
|
||||
"attributes": {
|
||||
"sha256": "3933545e6d41462dd6a47e44133ea40995bc6efeed8c2e4cbdf1a699303e95ea",
|
||||
"sha256": "67077e6fa918e4f4fd60ba169820b00be7c390c497bf9bc9cab2c255ea8e6f3e",
|
||||
"patches": [],
|
||||
"platform": "x86_64-pc-windows-msvc",
|
||||
"python_version": "3.11.6",
|
||||
"release_filename": "20231002/cpython-3.11.6+20231002-x86_64-pc-windows-msvc-shared-install_only.tar.gz",
|
||||
"python_version": "3.11.7",
|
||||
"release_filename": "20240107/cpython-3.11.7+20240107-x86_64-pc-windows-msvc-shared-install_only.tar.gz",
|
||||
"urls": [
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-x86_64-pc-windows-msvc-shared-install_only.tar.gz"
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.11.7+20240107-x86_64-pc-windows-msvc-shared-install_only.tar.gz"
|
||||
],
|
||||
"distutils_content": "",
|
||||
"strip_prefix": "python",
|
||||
@ -697,13 +699,13 @@
|
||||
"bzlFile": "@@rules_python~//python:repositories.bzl",
|
||||
"ruleClassName": "python_repository",
|
||||
"attributes": {
|
||||
"sha256": "ee37a7eae6e80148c7e3abc56e48a397c1664f044920463ad0df0fc706eacea8",
|
||||
"sha256": "4a51ce60007a6facf64e5495f4cf322e311ba9f39a8cd3f3e4c026eae488e140",
|
||||
"patches": [],
|
||||
"platform": "x86_64-unknown-linux-gnu",
|
||||
"python_version": "3.11.6",
|
||||
"release_filename": "20231002/cpython-3.11.6+20231002-x86_64-unknown-linux-gnu-install_only.tar.gz",
|
||||
"python_version": "3.11.7",
|
||||
"release_filename": "20240107/cpython-3.11.7+20240107-x86_64-unknown-linux-gnu-install_only.tar.gz",
|
||||
"urls": [
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-x86_64-unknown-linux-gnu-install_only.tar.gz"
|
||||
"https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.11.7+20240107-x86_64-unknown-linux-gnu-install_only.tar.gz"
|
||||
],
|
||||
"distutils_content": "",
|
||||
"strip_prefix": "python",
|
||||
@ -711,11 +713,28 @@
|
||||
"ignore_root_user_error": false
|
||||
}
|
||||
},
|
||||
"python_3_11_host": {
|
||||
"bzlFile": "@@rules_python~//python/private:toolchains_repo.bzl",
|
||||
"ruleClassName": "host_toolchain",
|
||||
"attributes": {
|
||||
"python_version": "3.11.7",
|
||||
"user_repository_name": "python_3_11",
|
||||
"platforms": [
|
||||
"aarch64-apple-darwin",
|
||||
"aarch64-unknown-linux-gnu",
|
||||
"ppc64le-unknown-linux-gnu",
|
||||
"s390x-unknown-linux-gnu",
|
||||
"x86_64-apple-darwin",
|
||||
"x86_64-pc-windows-msvc",
|
||||
"x86_64-unknown-linux-gnu"
|
||||
]
|
||||
}
|
||||
},
|
||||
"python_3_11": {
|
||||
"bzlFile": "@@rules_python~//python/private:toolchains_repo.bzl",
|
||||
"ruleClassName": "toolchain_aliases",
|
||||
"attributes": {
|
||||
"python_version": "3.11.6",
|
||||
"python_version": "3.11.7",
|
||||
"user_repository_name": "python_3_11",
|
||||
"platforms": [
|
||||
"aarch64-apple-darwin",
|
||||
@ -758,6 +777,11 @@
|
||||
}
|
||||
},
|
||||
"recordedRepoMappingEntries": [
|
||||
[
|
||||
"rules_python~",
|
||||
"bazel_skylib",
|
||||
"bazel_skylib~"
|
||||
],
|
||||
[
|
||||
"rules_python~",
|
||||
"bazel_tools",
|
||||
@ -768,8 +792,8 @@
|
||||
},
|
||||
"@@rules_python~//python/private/bzlmod:internal_deps.bzl%internal_deps": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "1i6gMQyoAiJrfcpo9Q19dcLoS+v74lw4sTTM2qFThGg=",
|
||||
"usagesDigest": "BrVH2YAnBLvfRcUpeIkB3x9QgBaBoYa0XGAVNTrTz5A=",
|
||||
"bzlTransitiveDigest": "7yogJIhmw7i9Wq/n9sQB8N0F84220dJbw64SjOwrmQk=",
|
||||
"usagesDigest": "r7vtlnQfWxEwrL+QFXux06yzeWEkq/hrcwAssoCoSLY=",
|
||||
"recordedFileInputs": {},
|
||||
"recordedDirentsInputs": {},
|
||||
"envVariables": {},
|
||||
|
||||
@ -120,7 +120,7 @@ def is_binary_file(ctx, basename):
|
||||
if ctx.target_platform_has_constraint(linux_constraint):
|
||||
return not (basename.startswith("lib") or basename.startswith("mongo_crypt_v") or basename.startswith("stitch_support.so"))
|
||||
elif ctx.target_platform_has_constraint(macos_constraint):
|
||||
return not (basename.startswith("lib") or basename.startswith("mongo_crypt_v") or basename.startswith("stitch_support.so"))
|
||||
return not (basename.startswith("lib") or basename.startswith("mongo_crypt_v") or basename.startswith("stitch_support.dylib"))
|
||||
elif ctx.target_platform_has_constraint(windows_constraint):
|
||||
return basename.endswith(".exe") or basename.endswith(".pdb") or basename.endswith(".dll") or basename.endswith(".ps1")
|
||||
else:
|
||||
@ -518,11 +518,18 @@ def mongo_install(
|
||||
attributes = pkg_attributes(mode = "644"),
|
||||
)
|
||||
|
||||
pkg_files(
|
||||
name = install_target + "_files",
|
||||
srcs = [install_target],
|
||||
attributes = pkg_attributes(mode = "755"),
|
||||
strip_prefix = install_target,
|
||||
testonly = testonly,
|
||||
)
|
||||
|
||||
# package up the the install into an archive.
|
||||
pkg_tar(
|
||||
name = "archive-" + name + install_type + "_tar",
|
||||
srcs = [install_target, install_target + "_licenses"],
|
||||
mode = "755",
|
||||
srcs = [install_target + "_files", install_target + "_licenses"],
|
||||
compressor = compressor,
|
||||
package_dir = package_extract_name,
|
||||
package_file_name = name + install_type + ".tgz",
|
||||
@ -543,8 +550,7 @@ def mongo_install(
|
||||
|
||||
pkg_zip(
|
||||
name = "archive-" + name + install_type + "_zip",
|
||||
srcs = [install_target, install_target + "_licenses"],
|
||||
mode = "755",
|
||||
srcs = [install_target + "_files", install_target + "_licenses"],
|
||||
package_dir = package_extract_name,
|
||||
package_file_name = name + install_type + ".zip",
|
||||
exec_properties = {
|
||||
|
||||
@ -33,3 +33,8 @@ symlink(
|
||||
input = "ubsan.denylist",
|
||||
output = "ubsan.denylist.h",
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "mac_plist",
|
||||
srcs = ["macos_mongodb.plist"],
|
||||
)
|
||||
|
||||
@ -57,6 +57,7 @@ mongo_cc_library(
|
||||
}),
|
||||
shared_lib_name = select({
|
||||
"@platforms//os:windows": "stitch_support_shared_with_debug.dll",
|
||||
"@platforms//os:macos": "stitch_support_shared_with_debug.dylib",
|
||||
"//conditions:default": "stitch_support_shared_with_debug.so",
|
||||
}),
|
||||
tags = ["stitch_support"],
|
||||
|
||||
Loading…
Reference in New Issue
Block a user