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

ref #4982, close #9147 Signed-off-by: CalvinNeo <calvinneo1995@gmail.com>
pingcap · Jun 15, 2024 · c0ce779 · c0ce779
1 parent 380a5f3
commit c0ce779
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/.github/licenserc.yml b/.github/licenserc.yml
@@ -39,6 +39,7 @@ header:
     - 'Cargo.lock'
     - 'Cargo.toml'
     - 'rust-toolchain'
+    - 'rust-toolchain.toml'
     - '.devcontainer/'
     - '**/OWNERS'
     - 'OWNERS_ALIASES'

diff --git a/contrib/tiflash-proxy b/contrib/tiflash-proxy
diff --git a/contrib/tiflash-proxy-cmake/CMakeLists.txt b/contrib/tiflash-proxy-cmake/CMakeLists.txt
@@ -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)

diff --git a/libs/libprocess_metrics/CMakeLists.txt b/libs/libprocess_metrics/CMakeLists.txt
@@ -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)

diff --git a/libs/libsymbolization/CMakeLists.txt b/libs/libsymbolization/CMakeLists.txt
@@ -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)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1 @@
+contrib/tiflash-proxy/rust-toolchain.toml