From 3ac5a3fb3e2aa118db02a526144f63ea92495c72 Mon Sep 17 00:00:00 2001
From: wuhuiquan <wuhuiquan4@huawei.com>
Date: Mon, 6 Jan 2025 10:14:45 +0800
Subject: [PATCH] =?UTF-8?q?[CI]=20modify=20build=20config=20=20=20=20=20?=
 =?UTF-8?q?=201=E3=80=81Fix=20LLVM=20commit=20info=20in=20version=20number?=
 =?UTF-8?q?.=20=20=20=20=20=202=E3=80=81Modify=20static=20source=20downloa?=
 =?UTF-8?q?d=20url.=20=20=20=20=20=203=E3=80=81Use=20LLVM=20code=20downloa?=
 =?UTF-8?q?ded=20through=20repo.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wuhuiquan <wuhuiquan4@huawei.com>
---
 rust-build/function.sh      | 6 +++---
 rust-build/ohos_ci_build.sh | 8 ++++----
 rust-build/ohos_ci_test.sh  | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rust-build/function.sh b/rust-build/function.sh
index 786026eee3b..5c0fbd85933 100644
--- a/rust-build/function.sh
+++ b/rust-build/function.sh
@@ -85,7 +85,7 @@ move_static_rust_source() {
 download_rust_static_source() {
     local pre_rust_date="2023-07-13"
     mkdir -p ${rust_static_dir} ${rust_source_dir}/build/cache/${pre_rust_date}
-    local rust_down_net="https://mirrors.ustc.edu.cn/rust-static/dist"
+    local rust_down_net="https://repo.huaweicloud.com/harmonyos/compiler/rust"
     pushd ${rust_static_dir}
     local platform=$1
     local cpu=$2
@@ -94,11 +94,11 @@ download_rust_static_source() {
 
     for file in "${files[@]}"; do
         if [ ! -e "${file}" ]; then
-            curl -O -k -m 300 ${rust_down_net}/${pre_rust_date}/${file} &
+            curl -O -k -m 300 ${rust_down_net}/1.71.0/${file} &
         fi
     done
     if [ ! -e "rustc-1.72.0-src.tar.gz" ]; then
-            curl -O -k -m 300 ${rust_down_net}/rustc-1.72.0-src.tar.gz &
+            curl -O -k -m 300 ${rust_down_net}/1.72.0/rustc-1.72.0-src.tar.gz &
     fi
     wait
     popd
diff --git a/rust-build/ohos_ci_build.sh b/rust-build/ohos_ci_build.sh
index 9e685b3243a..a53499d1c3f 100644
--- a/rust-build/ohos_ci_build.sh
+++ b/rust-build/ohos_ci_build.sh
@@ -16,10 +16,10 @@ new_version="xxxxx"
 source ${shell_path}/function.sh
 
 get_new_version() {
-    pushd ${root_build_dir}/../harmony/llvm/
+    pushd ${root_build_dir}/third_party/llvm-project/
     local commit_id_full=$(git rev-parse HEAD)
-    local commit_id_short=${commit_id_full:1:10}
-    new_version="OHOS llvm-preject $commit_id_short"
+    local commit_id_short=${commit_id_full:0:10}
+    new_version="OHOS llvm-project $commit_id_short"
     popd
 }
 
@@ -49,7 +49,7 @@ main() {
     move_static_rust_source ${rust_static_dir} ${rust_source_dir}
 
     rm -rf ${rust_source_dir}/src/llvm-project/*
-    cp -r ${root_build_dir}/../harmony/llvm/* ${rust_source_dir}/src/llvm-project/
+    cp -r ${root_build_dir}/third_party/llvm-project/*  ${rust_source_dir}/src/llvm-project/
 
     pushd ${rust_source_dir}
     export_ohos_path
diff --git a/rust-build/ohos_ci_test.sh b/rust-build/ohos_ci_test.sh
index dda54ca54ee..2c69c74c9a1 100644
--- a/rust-build/ohos_ci_test.sh
+++ b/rust-build/ohos_ci_test.sh
@@ -23,7 +23,7 @@ main() {
     move_static_rust_source ${rust_static_dir} ${rust_source_dir}
 
     rm -rf ${rust_source_dir}/src/llvm-project/*
-    cp -r ${root_build_dir}/../harmony/llvm/* ${rust_source_dir}/src/llvm-project/
+    cp -r ${root_build_dir}/third_party/llvm-project/* ${rust_source_dir}/src/llvm-project/
 
     pushd ${rust_source_dir}
     export_ohos_path
-- 
Gitee