Merge pull request #402 from Tencent/release/v1.3.1

Release/v1.3.1

Author: iyangsj

.cargo/aarch64-unknown-linux-ohos-clang.sh

@@ -132,20 +132,20 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
-      - name: Install rust toolchain
-        run: rustup target add ${{ env.TARGET }}
-      - name: Download OHOS NDK
-        run: |
-          wget https://repo.huaweicloud.com/openharmony/os/4.0-Release/ohos-sdk-windows_linux-public.tar.gz
-          tar -xvzf ohos-sdk-windows_linux-public.tar.gz
-          cd ohos-sdk/linux/
-          unzip -q native-linux-x64-4.0.10.13-Release.zip
+
+      - name: Setup OpenHarmony SDK
+        uses: openharmony-rs/setup-ohos-sdk@v0.1.3
+        with:
+          version: '4.1'
+
+      - name: Setup Rust environment
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+          target: 'aarch64-unknown-linux-ohos,armv7-unknown-linux-ohos,x86_64-unknown-linux-ohos'
+
       - name: Run cargo build
-        run: |
-          OHOS_NDK_HOME=${{ github.workspace }}/ohos-sdk/linux/ \
-          CC_aarch64_unknown_linux_ohos=${OHOS_NDK_HOME}/native/llvm/bin/clang \
-          AR_aarch64_unknown_linux_ohos=${OHOS_NDK_HOME}/native/llvm/bin/llvm-ar \
-          cargo build --target ${{ env.TARGET }} --verbose --features ffi --release
+        run: cargo install ohrs && ohrs build -- --verbose --features ffi --release
 
   static_analysis:
     name: Static analysis

.cargo/config.toml

@@ -18,3 +18,5 @@ Cargo.lock
 
 # Misc
 .DS_Store
+
+dist

.github/workflows/rust.yml

@@ -11,10 +11,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [v1.3.1] - 2024-10-11
+
+### Added
+- Use ohrs to build tquic for HarmaryOS
+- Support building for HarmonyOS on arm/x86_64 architecture
+
+
 ## [v1.3.0] - 2024-10-10
 
 ### Added
-- Support building for HarmonyOS
+- Support building for HarmonyOS on aarch64 architecture
 - Support disable_1rtt_encryption transport parameter
 - Support sending 1-RTT packets on the server before handshake completion
 - Resolve new issues found by cargo clippy
@@ -319,6 +326,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Provide example clients and servers.
 
 
+[v1.3.1]: https://github.com/tencent/tquic/compare/v1.3.0...v1.3.1
 [v1.3.0]: https://github.com/tencent/tquic/compare/v1.2.0...v1.3.0
 [v1.2.0]: https://github.com/tencent/tquic/compare/v1.1.0...v1.2.0
 [v1.1.0]: https://github.com/tencent/tquic/compare/v1.0.0...v1.1.0

.gitignore

@@ -1,6 +1,6 @@
 [package]
 name = "tquic"
-version = "1.3.0"
+version = "1.3.1"
 edition = "2021"
 rust-version = "1.70.0"
 license = "Apache-2.0"

CHANGELOG.md

@@ -58,8 +58,11 @@ const CMAKE_PARAMS_IOS: &[(&str, &[(&str, &str)])] = &[
 ];
 
 /// Additional parameters for Ohos
-const CMAKE_PARAMS_OHOS_NDK: &[(&str, &[(&str, &str)])] =
-    &[("aarch64", &[("OHOS_ARCH", "arm64-v8a")])];
+const CMAKE_PARAMS_OHOS_NDK: &[(&str, &[(&str, &str)])] = &[
+    ("aarch64", &[("OHOS_ARCH", "arm64-v8a")]),
+    ("arm", &[("OHOS_ARCH", "armeabi-v7a")]),
+    ("x86_64", &[("OHOS_ARCH", "x86_64")]),
+];
 
 /// Create a cmake::Config for building BoringSSL.
 fn new_boringssl_cmake_config() -> cmake::Config {
@@ -112,7 +115,11 @@ fn new_boringssl_cmake_config() -> cmake::Config {
                         for (name, value) in *params {
                             boringssl_cmake.define(name, value);
                         }
-                        break;
+                        // common arguments for ohos help us to ignore some error
+                        boringssl_cmake
+                            .define("CMAKE_C_FLAGS", "-Wno-unused-command-line-argument");
+                        boringssl_cmake
+                            .define("CMAKE_CXX_FLAGS", "-Wno-unused-command-line-argument");
                     }
                 }
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tquic_tools"
-version = "1.3.0"
+version = "1.3.1"
 edition = "2021"
 rust-version = "1.70.0"
 license = "Apache-2.0"
@@ -22,7 +22,7 @@ slab = "0.4"
 rand = "0.8.5"
 statrs = "0.16"
 signal-hook = "0.3.17"
-tquic = { path = "..", version = "1.3.0"}
+tquic = { path = "..", version = "1.3.1"}
 
 [target."cfg(unix)".dependencies]
 jemallocator = { version = "0.5", package = "tikv-jemallocator" }