aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-03-11 00:59:06 +0300
committerarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-03-11 00:59:06 +0300
commitbac5cd25f6f348d2a3f5d2243f8d10013dc37c03 (patch)
tree710c0e46bfdcf52615b31407e3d6f07a7c978415
parent31a6bda94bf00dca9e46d1472cea2b38d3dde8dc (diff)
downloadydb-bac5cd25f6f348d2a3f5d2243f8d10013dc37c03.tar.gz
intermediate changes
ref:df14ffb388f574a63b30a7273ec2ebabb126c3ba
-rw-r--r--build/platform/cuda/ya.make7
-rw-r--r--build/rules/go/vendor.policy47
-rw-r--r--build/scripts/fake/dummy.proto1
-rw-r--r--build/ya.conf.json38
-rw-r--r--contrib/a.yaml2
5 files changed, 70 insertions, 25 deletions
diff --git a/build/platform/cuda/ya.make b/build/platform/cuda/ya.make
index 4e7a3e64e4..e8884fd1cf 100644
--- a/build/platform/cuda/ya.make
+++ b/build/platform/cuda/ya.make
@@ -187,7 +187,12 @@ ENDIF()
IF (HOST_OS_WINDOWS)
LDFLAGS(cudadevrt.lib cudart_static.lib)
ELSE()
- EXTRALIBS(-lcudadevrt -lcudart_static -lculibos)
+ EXTRALIBS(-lcudadevrt -lculibos)
+ IF (USE_DYNAMIC_CUDA)
+ EXTRALIBS(-lcudart)
+ ELSE()
+ EXTRALIBS(-lcudart_static)
+ ENDIF()
ENDIF()
END()
diff --git a/build/rules/go/vendor.policy b/build/rules/go/vendor.policy
index 22fcbc4d3b..a68f26b47a 100644
--- a/build/rules/go/vendor.policy
+++ b/build/rules/go/vendor.policy
@@ -865,6 +865,31 @@ ALLOW .* -> vendor/github.com/scim2/filter-parser/v2
# CONTRIB-2488 reading and writing SSH Key Revocation Lists
ALLOW .* -> vendor/github.com/stripe/krl
+# CONTRIB-2460
+ALLOW .* -> vendor/github.com/dgraph-io/ristretto
+
+# CONTRIB-2465
+ALLOW .* -> vendor/github.com/go-playground/form
+
+# CONTRIB-2470
+# go-autorest requried to be used for authentication and authorization in Azure sdk
+ALLOW .* -> vendor/github.com/Azure/go-autorest/autorest
+# whole SDK is HUGE (~500MiB commit size) and, for now, we need only network management part
+# new parts of SDK may be added later, as needed
+ALLOW .* -> vendor/github.com/Azure/azure-sdk-for-go/profiles/latest/network/mgmt/network
+
+# CONTRIB-2483
+ALLOW .* -> vendor/github.com/hashicorp/hcl/v2
+
+# CONTRIB-2485
+ALLOW .* -> vendor/github.com/nxadm/tail
+
+# CONTRIB-2486
+ALLOW .* -> vendor/github.com/zclconf/go-cty/cty
+
+# CONTRIB-553
+ALLOW .* -> vendor/github.com/google/brotli/go/cbrotli
+
#
# Tools
#
@@ -1040,28 +1065,6 @@ ALLOW infra/infractl/.* -> vendor/github.com/ghodss/yaml
# CONTRIB-2445
ALLOW psp -> vendor/github.com/zimmski/go-mutesting
-# CONTRIB-2460
-ALLOW .* -> vendor/github.com/dgraph-io/ristretto
-
-# CONTRIB-2465
-ALLOW .* -> vendor/github.com/go-playground/form
-
-# CONTRIB-2470
-# go-autorest requried to be used for authentication and authorization in Azure sdk
-ALLOW .* -> vendor/github.com/Azure/go-autorest/autorest
-# whole SDK is HUGE (~500MiB commit size) and, for now, we need only network management part
-# new parts of SDK may be added later, as needed
-ALLOW .* -> vendor/github.com/Azure/azure-sdk-for-go/profiles/latest/network/mgmt/network
-
-# CONTRIB-2483
-ALLOW .* -> vendor/github.com/hashicorp/hcl/v2
-
-# CONTRIB-2485
-ALLOW .* -> vendor/github.com/nxadm/tail
-
-# CONTRIB-2486
-ALLOW .* -> vendor/github.com/zclconf/go-cty/cty
-
#
# This section is for EXCEPTIONS. Add new rule above, not here.
#
diff --git a/build/scripts/fake/dummy.proto b/build/scripts/fake/dummy.proto
new file mode 100644
index 0000000000..b08506575c
--- /dev/null
+++ b/build/scripts/fake/dummy.proto
@@ -0,0 +1 @@
+# This is temporary hack to distinguish `.proto` dependencies built with and without PROTOC_TRANSITIVE_HEADERS (st/YMAKE-108)
diff --git a/build/ya.conf.json b/build/ya.conf.json
index 3a2fb200ea..97439352ef 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -519,6 +519,9 @@
},
"exp_stats": {
"description": "bsyeti tool"
+ },
+ "lama": {
+ "description": "Analytics tool for safe reactor calculation"
}
},
"toolchain": {
@@ -720,6 +723,28 @@
}
]
},
+ "lama": {
+ "tools": {
+ "lama": {
+ "bottle": "lama",
+ "executable": "lama"
+ }
+ },
+ "platforms": [
+ {
+ "host": {
+ "os": "LINUX"
+ },
+ "default": true
+ },
+ {
+ "host": {
+ "os": "DARWIN"
+ },
+ "default": true
+ }
+ ]
+ },
"caesar_profile_size_analyzer": {
"tools": {
"caesar_profile_size_analyzer": {
@@ -8397,7 +8422,7 @@
},
"caesar_lookup_profile": {
"formula": {
- "sandbox_id": 1239152137,
+ "sandbox_id": 1239149477,
"match": "lookup_profile"
},
"executable": {
@@ -8417,6 +8442,17 @@
]
}
},
+ "lama": {
+ "formula": {
+ "sandbox_id": 1239609953,
+ "match": "lama"
+ },
+ "executable": {
+ "lama": [
+ "lama"
+ ]
+ }
+ },
"caesar_profile_size_analyzer": {
"formula": {
"sandbox_id": 1239150326,
diff --git a/contrib/a.yaml b/contrib/a.yaml
index f0703deab8..78ddb12188 100644
--- a/contrib/a.yaml
+++ b/contrib/a.yaml
@@ -5,7 +5,7 @@ arcanum:
disabling_policy: denied
groups:
- name: reviewers
- roles: [ "cc:developer" ]
+ roles: [ "cc:duty", "cc:developer" ]
rules:
- reviewers:
- name: reviewers