exclude ohos from workspace (#1080)

.github/workflows/ohos.yml

@@ -33,6 +33,8 @@ jobs:
           paths: '["Cargo.toml", "Cargo.lock", "easytier/**", "easytier-contrib/easytier-ohrs/**", ".github/workflows/ohos.yml", ".github/workflows/install_rust.sh"]'
   build-ohos:
     runs-on: ubuntu-latest
+    needs: pre_job
+    if: needs.pre_job.outputs.should_skip != 'true'
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies
@@ -99,6 +101,7 @@ jobs:
           source env.sh
           cargo install ohrs
           rustup target add aarch64-unknown-linux-ohos
+          cargo update easytier
           ohrs doctor
           ohrs build --release --arch aarch
           

Cargo.lock

@@ -1321,15 +1321,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
-[[package]]
-name = "convert_case"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "cookie"
 version = "0.18.1"
@@ -1797,7 +1788,7 @@ version = "0.99.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
- "convert_case 0.4.0",
+ "convert_case",
  "proc-macro2",
  "quote",
  "rustc_version",
@@ -2109,23 +2100,6 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "easytier-ohrs"
-version = "0.1.0"
-dependencies = [
- "easytier",
- "napi-build-ohos",
- "napi-derive-ohos",
- "napi-ohos",
- "ohos-hilog-binding",
- "once_cell",
- "serde_json",
- "tracing",
- "tracing-core",
- "tracing-subscriber",
- "uuid",
-]
-
 [[package]]
 name = "easytier-rpc-build"
 version = "0.1.0"
@@ -4538,67 +4512,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "napi-build-ohos"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ad5bf214216afe5b572da0bcd5cab932d17cbcca3dbe82991db0d765a764c8a"
-
-[[package]]
-name = "napi-derive-backend-ohos"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd974d6316c670078fa15276c6134e5b45142b393db350b24682ae613733cdac"
-dependencies = [
- "convert_case 0.7.1",
- "once_cell",
- "proc-macro2",
- "quote",
- "semver",
- "syn 2.0.87",
-]
-
-[[package]]
-name = "napi-derive-ohos"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3a8b89bbc39f81c472e76813dcd837f311aae7850a24a01d0bf5858221b1fd2"
-dependencies = [
- "convert_case 0.7.1",
- "napi-derive-backend-ohos",
- "proc-macro2",
- "quote",
- "syn 2.0.87",
-]
-
-[[package]]
-name = "napi-ohos"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32036ede4ef064610304337831e9d49dac23e7edc4e9efd076c8259eab6d19a9"
-dependencies = [
- "bitflags 2.8.0",
- "chrono",
- "ctor",
- "encoding_rs",
- "futures-core",
- "indexmap 2.7.1",
- "napi-sys-ohos",
- "serde",
- "serde_json",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "napi-sys-ohos"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e18642400316f886a6f153b2fbc48f5652d0e117803057005f89f0e48217d64"
-dependencies = [
- "libloading 0.8.5",
-]
-
 [[package]]
 name = "native-tls"
 version = "0.2.12"
@@ -5217,22 +5130,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "ohos-hilog-binding"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f360d22e965a34286283d36e8864fdfb04f443697641e8f6cbd64e670c3a3d5"
-dependencies = [
- "libc",
- "ohos-hilogs-sys",
-]
-
-[[package]]
-name = "ohos-hilogs-sys"
-version = "0.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed07615005d0f8d7bcf901f89c8ff4870666a9bdb00382f588af383f40c160b7"
-
 [[package]]
 name = "once_cell"
 version = "1.21.3"

Cargo.toml

@@ -6,9 +6,11 @@ members = [
     "easytier-rpc-build",
     "easytier-web",
     "easytier-contrib/easytier-ffi",
-    "easytier-contrib/easytier-ohrs",
 ]
 default-members = ["easytier", "easytier-web"]
+exclude = [
+    "easytier-contrib/easytier-ohrs", # it needs ohrs sdk
+]
 
 [profile.dev]
 panic = "unwind"

easytier-contrib/easytier-ohrs/Cargo.toml

@@ -8,7 +8,7 @@ crate-type=["cdylib"]
 
 [dependencies]
 ohos-hilog-binding = {version = "*", features = ["redirect"]}
-easytier = { path = "../../easytier" }
+easytier = { git = "https://github.com/EasyTier/EasyTier.git" }
 napi-derive-ohos = "1.0.4"
 napi-ohos = { version = "1.0.4", default-features = false, features = [
     "serde-json",