Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update proxy of master to upgrade-near-8.2 #9148

Merged
merged 8 commits into from
Jun 15, 2024
Merged

update proxy of master to upgrade-near-8.2 #9148

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
12b7991
update tiflash proxy to proxy_up/upgrade-near-8.2
CalvinNeo Jun 14, 2024
2c95c70
rust-toolchain
CalvinNeo Jun 14, 2024
9331bca
a
CalvinNeo Jun 14, 2024
2062bcd
d
CalvinNeo Jun 14, 2024
d67b35d
z
CalvinNeo Jun 14, 2024
76cda13
a
CalvinNeo Jun 14, 2024
83b886b
f
CalvinNeo Jun 15, 2024
6a9a0df
u
CalvinNeo Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/tiflash-proxy
Open in desktop
Submodule tiflash-proxy updated 669 files
2 changes: 1 addition & 1 deletion contrib/tiflash-proxy-cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ add_custom_command(OUTPUT ${_TIFLASH_PROXY_LIBRARY}
WORKING_DIRECTORY ${_TIFLASH_PROXY_SOURCE_DIR}
DEPENDS "${_TIFLASH_PROXY_SRCS}"
"${_TIFLASH_PROXY_SOURCE_DIR}/Cargo.lock"
"${TiFlash_SOURCE_DIR}/rust-toolchain")
"${TiFlash_SOURCE_DIR}/rust-toolchain.toml")

add_custom_target(tiflash_proxy ALL DEPENDS ${_TIFLASH_PROXY_LIBRARY})
add_library(libtiflash_proxy SHARED IMPORTED GLOBAL)
Expand Down
2 changes: 1 addition & 1 deletion libs/libprocess_metrics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ add_custom_command(OUTPUT ${_PROCESS_METRICS_LIBRARY}
"${_PROCESS_METRICS_HEADERS}"
"${_PROCESS_METRICS_SOURCE_DIR}/Cargo.lock"
"${_PROCESS_METRICS_SOURCE_DIR}/Cargo.toml"
"${TiFlash_SOURCE_DIR}/rust-toolchain")
"${TiFlash_SOURCE_DIR}/rust-toolchain.toml")

add_custom_target(_process_metrics ALL DEPENDS ${_PROCESS_METRICS_LIBRARY} JOB_POOL rust_job_pool)
add_library(process_metrics STATIC IMPORTED GLOBAL)
Expand Down
2 changes: 1 addition & 1 deletion libs/libsymbolization/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ add_custom_command(OUTPUT ${_SYMBOLIZATION_LIBRARY}
"${_SYMBOLIZATION_HEADERS}"
"${_SYMBOLIZATION_SOURCE_DIR}/Cargo.lock"
"${_SYMBOLIZATION_SOURCE_DIR}/Cargo.toml"
"${TiFlash_SOURCE_DIR}/rust-toolchain")
"${TiFlash_SOURCE_DIR}/rust-toolchain.toml")

add_custom_target(symbolization ALL DEPENDS ${_SYMBOLIZATION_LIBRARY})
add_library(libsymbolization STATIC IMPORTED GLOBAL)
Expand Down
1 change: 1 addition & 0 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
contrib/tiflash-proxy/rust-toolchain.toml