aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-ya-builder <robot-ya-builder@yandex-team.com>2023-10-11 11:25:36 +0300
committerrobot-ya-builder <robot-ya-builder@yandex-team.com>2023-10-11 12:16:17 +0300
commitdbf3503a44bcf507df7e7483c936ba7a20cbbacb (patch)
tree5a2f0025a165d4a9c6edc2d92117ef18d00329d1
parent84c5d4bb733b49d5f9f36dbf0c22ec200d9e6334 (diff)
downloadydb-dbf3503a44bcf507df7e7483c936ba7a20cbbacb.tar.gz
External build system generator release 57
Update tools: yexport, os-yexport
-rw-r--r--CMakeLists.txt12
-rw-r--r--build/external_resources/yexport/resources.json6
-rw-r--r--build/mapping.conf.json12
3 files changed, 15 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1cdb522c0..6f14d6f089 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,17 +39,17 @@ include(cmake/shared_libs.cmake)
include(cmake/global_vars.cmake)
if (CMAKE_CROSSCOMPILING)
- include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
+ include(${{CMAKE_BINARY_DIR}}/conan_paths.cmake)
else()
conan_cmake_autodetect(settings)
conan_cmake_install(
- PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR}
- INSTALL_FOLDER ${CMAKE_BINARY_DIR}
+ PATH_OR_REFERENCE ${{CMAKE_SOURCE_DIR}}
+ INSTALL_FOLDER ${{CMAKE_BINARY_DIR}}
BUILD missing
REMOTE conancenter
- SETTINGS ${settings}
- ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}"
- CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}"
+ SETTINGS ${{settings}}
+ ENV "CONAN_CMAKE_GENERATOR=${{CMAKE_GENERATOR}}"
+ CONF "tools.cmake.cmaketoolchain:generator=${{CMAKE_GENERATOR}}"
)
endif()
diff --git a/build/external_resources/yexport/resources.json b/build/external_resources/yexport/resources.json
index 4b08daa264..0995e84e2a 100644
--- a/build/external_resources/yexport/resources.json
+++ b/build/external_resources/yexport/resources.json
@@ -1,13 +1,13 @@
{
"by_platform": {
"darwin": {
- "uri": "sbr:5111970858"
+ "uri": "sbr:5228928365"
},
"darwin-arm64": {
- "uri": "sbr:5111976416"
+ "uri": "sbr:5228924637"
},
"linux": {
- "uri": "sbr:5112005661"
+ "uri": "sbr:5228936169"
}
}
}
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 591bffbd2c..b84644c9f7 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -102,9 +102,9 @@
"5054512910": "http://devtools-registry.s3.yandex.net/5054512910",
"5054518131": "http://devtools-registry.s3.yandex.net/5054518131",
"5054515588": "http://devtools-registry.s3.yandex.net/5054515588",
- "5111996178": "http://devtools-registry.s3.yandex.net/5111996178",
- "5111987261": "http://devtools-registry.s3.yandex.net/5111987261",
- "5111998098": "http://devtools-registry.s3.yandex.net/5111998098",
+ "5228939804": "http://devtools-registry.s3.yandex.net/5228939804",
+ "5228943140": "http://devtools-registry.s3.yandex.net/5228943140",
+ "5228927925": "http://devtools-registry.s3.yandex.net/5228927925",
"5171095103": "http://devtools-registry.s3.yandex.net/5171095103",
"5171093801": "http://devtools-registry.s3.yandex.net/5171093801",
"5171093016": "http://devtools-registry.s3.yandex.net/5171093016",
@@ -214,9 +214,9 @@
"5054512910": "ya-tc for darwin-arm64",
"5054518131": "ya-tc for linux",
"5054515588": "ya-tc for linux-aarch64",
- "5111996178": "yexport for darwin",
- "5111987261": "yexport for darwin-arm64",
- "5111998098": "yexport for linux",
+ "5228939804": "yexport for darwin",
+ "5228943140": "yexport for darwin-arm64",
+ "5228927925": "yexport for linux",
"5171095103": "ymake for darwin",
"5171093801": "ymake for darwin-arm64",
"5171093016": "ymake for linux",