fix: code coverage flags && add cargo deny (#144)

* fix: coverage Signed-off-by: Yuhang Shi <[email protected]> * fix(rust): fix rust csharp binding targetFramework missing * feat: remove nightly Signed-off-by: Yuhang Shi <[email protected]> * fix: coverage build Signed-off-by: Yuhang Shi <[email protected]> * fix: clippy Signed-off-by: Yuhang Shi <[email protected]> --------- Signed-off-by: Yuhang Shi <[email protected]> Co-authored-by: moyil <[email protected]>
pleisto · Nov 14, 2023 · 737abac · 737abac
1 parent 0fb77bc
commit 737abac
Show file tree

Hide file tree

Showing 13 changed files with 374 additions and 34 deletions.
diff --git a/.cargo/config b/.cargo/config
@@ -19,7 +19,7 @@ rustflags = ["-C", "target-cpu=sandybridge"]
 rustflags = ["-C", "target-cpu=sandybridge"]
 
 [target.aarch64-apple-darwin]
-rustflags = ["-C", "target-cpu=apple-m1",  "-C", "link-arg=-undefined",
+rustflags = ["-C", "target-cpu=apple-m1", "-C", "link-arg=-undefined",
   "-C", "link-arg=dynamic_lookup"]
 
 [target.x86_64-apple-darwin]

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -10,6 +10,7 @@ on:
     paths:
       - 'codecov.yml'
       - '.github/workflows/coverage.yml'
+      - 'packages/rust-core/**'
       - 'packages/nodejs/**'
       - 'packages/kotlin/**'
       - 'packages/csharp/**'
@@ -18,11 +19,37 @@ on:
     paths:
       - 'codecov.yml'
       - '.github/workflows/coverage.yml'
+      - 'packages/rust-core/**'
       - 'packages/nodejs/**'
       - 'packages/kotlin/**'
       - 'packages/csharp/**'
 
 jobs:
+  rust:
+    name: rust-coverage
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: dtolnay/rust-toolchain@nightly
+
+      - run: cargo install cargo-tarpaulin
+
+      - name: Generate code coverage
+        working-directory: packages/rust-core
+        run: |
+          cargo +nightly tarpaulin --verbose --all-features --workspace --timeout 300 --run-types doctests --run-types lib --run-types tests --out xml
+
+      - name: Upload to codecov.io
+        uses: codecov/codecov-action@v3
+        with:
+          working-directory: packages/rust-core
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: rust
+          name: rust-upload
+          fail_ci_if_error: true
+          verbose: true
+
   nodejs:
     name: nodejs-coverage
     runs-on: ubuntu-latest
@@ -46,8 +73,7 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           working-directory: packages/nodejs
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+          token: ${{ secrets.CODECOV_TOKEN }}
           flags: nodejs
           name: nodejs-upload
           fail_ci_if_error: true
@@ -77,8 +103,9 @@ jobs:
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          working-directory: packages/kotlin
+          token: ${{ secrets.CODECOV_TOKEN }}
           flags: kotlin
           name: kotlin-upload
           fail_ci_if_error: true
@@ -123,8 +150,7 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           working-directory: packages/csharp
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+          token: ${{ secrets.CODECOV_TOKEN }}
           flags: csharp
           name: csharp-upload
           fail_ci_if_error: true

diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml
@@ -56,6 +56,17 @@ jobs:
       - name: Clippy
         run: cargo clippy --all-targets --all-features -- -D warnings
 
+  deny:
+    name: rust-ci-deny
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: dtolnay/rust-toolchain@stable
+
+      - run: cargo install cargo-deny
+      - run: cargo deny check
+
   windows-test:
     name: rust-ci-test-windows
     runs-on: windows-latest

diff --git a/codecov.yml b/codecov.yml
@@ -20,6 +20,9 @@ coverage:
         flags:
           - csharp
 flags:
+  rust:
+    paths:
+      - packages/rust-core/
   nodejs:
     paths:
       - packages/nodejs/

diff --git a/packages/rust-core/.gitignore b/packages/rust-core/.gitignore
@@ -0,0 +1,2 @@
+cobertura.xml
+*.profraw
diff --git a/packages/rust-core/Cargo.lock b/packages/rust-core/Cargo.lock
diff --git a/packages/rust-core/Cargo.toml b/packages/rust-core/Cargo.toml
@@ -6,7 +6,10 @@ resolver = "2"
 [workspace.package]
 license = "Apache-2.0"
 repository = "https://github.com/pleisto/flappy"
+homepage = "https://flappy.pleisto.com"
 edition = "2021"
+keywords = []
+categories = []
 
 [workspace.dependencies]
 mimalloc = { version = "0.1.39", default-features = false }

diff --git a/packages/rust-core/csharp/Cargo.toml b/packages/rust-core/csharp/Cargo.toml
@@ -4,6 +4,10 @@ version = "0.1.0"
 edition.workspace = true
 license.workspace = true
 repository.workspace = true
+homepage.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
 publish = false
 
 

diff --git a/packages/rust-core/csharp/Pleisto.Flappy.Native.csproj b/packages/rust-core/csharp/Pleisto.Flappy.Native.csproj
@@ -8,6 +8,7 @@
       <PackageTags>native</PackageTags>
       <PackageReadmeFile>README.md</PackageReadmeFile>
       <PackageLicenseFile>LICENSE</PackageLicenseFile>
+      <TargetFrameworks>net7.0;net6.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,9 @@ coverage: @@
             flags:
               - csharp
     flags:
+      rust:
+        paths:
+          - packages/rust-core/
       nodejs:
         paths:
           - packages/nodejs/
@@ Expand Down @@