Merge pull request #2 from tw-sdv/vsomeip_rs_in_crates

Move vsomeip-rs from separate repo to crates subdirectory
thoughtworks · Aug 1, 2024 · ec3cc97 · ec3cc97
2 parents 5a53926 + 23b90da
commit ec3cc97
Show file tree

Hide file tree

Showing 28 changed files with 3,586 additions and 8 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -8,13 +8,37 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-
+  LD_LIBRARY_PATH: /usr/lib
 jobs:
   build:
-
     runs-on: ubuntu-latest
+    container: fedora:38
 
     steps:
+    - name: Setup cmake
+      run: sudo dnf -y install cmake 
+    - name: Install dependencies
+      run: sudo dnf -y install make git clang boost-devel nodejs
+
+    - name: Install latest stable Rust
+      uses: actions-rs/toolchain@v1
+      with:
+          toolchain: stable
+
+    - name: Install vsomeip
+      run: |
+           git clone https://github.com/COVESA/vsomeip
+           cd vsomeip
+           git checkout cf497232adf84f55947f7a24e1b64e04b49f1f38
+           mkdir build
+           cd build
+           # https://github.com/COVESA/vsomeip/issues/688
+           # https://github.com/COVESA/vsomeip/issues/527
+           cmake -E env CXXFLAGS="-Wno-error=stringop-overflow" cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Debug
+           make -j
+           sudo make install
+           cd ../..
+
     - uses: actions/checkout@v3
     - name: Build
       run: cargo build --workspace --all-features --verbose

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/smip_al/Cargo.toml b/crates/smip_al/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-vsomeip-rs = {git = "ssh://git@github.com/tw-sdv/vsomeip-rs"}
+vsomeip-rs = {path = "../vsomeip-rs"}
 someip_types = { path = "../someip_types" }
diff --git a/crates/smip_core/Cargo.toml b/crates/smip_core/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 parking_lot = "0.12"
 someip_types = {path = "../someip_types"}
-vsomeip-rs = {git = "ssh://git@github.com/tw-sdv/vsomeip-rs"}
+vsomeip-rs = {path = "../vsomeip-rs"}
 vsomeip_compat = {path = "../vsomeip_compat"}
 serde = "1"
 bincode = "1"

diff --git a/crates/someip_types/Cargo.toml b/crates/someip_types/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 serde = { version = "1", features = ["derive"], optional = true}
-vsomeip-rs = {git = "ssh://git@github.com/tw-sdv/vsomeip-rs"}
+vsomeip-rs = {path = "../vsomeip-rs"}
 
 [features]
 default = []

diff --git a/crates/vsomeip-rs/.gitignore b/crates/vsomeip-rs/.gitignore
@@ -0,0 +1 @@
+/target