diff --git a/rust-build/function.sh b/rust-build/function.sh index 786026eee3bee9a81eb0c837ccf2b460f9862193..5c0fbd859336ae64f8b436a13acc516a1111d2bb 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 9e685b3243a20f2d92fede316aa084d137547315..a53499d1c3f1eddd79bf0b53ad3862d822d04927 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 dda54ca54eeaf9fb896679096a5037d6e57f830c..2c69c74c9a1bff594f6a506c5616d5563f95b35f 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