ci: run tarpaulin by default

jeremylvln · Oct 11, 2023 · 110f2c0 · 110f2c0
1 parent fc63bc2
commit 110f2c0
Show file tree

Hide file tree

Showing 20 changed files with 91 additions and 45 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,10 @@
 name: ci
 
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches:
+      - main
 
 env:
   TARGET_NODE_VERSION: '20'
@@ -99,7 +103,7 @@ jobs:
           workspaces: . -> dist/rust
 
       - name: Install Rust dependencies
-        run: cargo check
+        run: cargo install cargo-tarpaulin && cargo check
 
       - name: Run tests
         uses: mansagroup/nrwl-nx-action@v3
@@ -108,11 +112,6 @@ jobs:
           # parallel: 3
           parallel: 1
 
-      - name: Create coverage report with Tarpaulin
-        run: |
-          cargo install cargo-tarpaulin
-          cargo tarpaulin --out xml --output-dir coverage/rust --workspace
-
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
         env:
@@ -169,6 +168,8 @@ jobs:
   semantic:
     runs-on: ubuntu-latest
 
+    if: github.event_name == 'pull_request'
+
     steps:
       - name: Ensure semantic
         uses: amannn/action-semantic-pull-request@v5

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,26 +1,20 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-    idea
-    java
-    `java-library`
-    jacoco
-    `maven-publish`
-    signing
+    id("idea")
+    id("java")
+    id("java-library")
+    id("jacoco")
+    id("maven-publish")
+    id("signing")
     kotlin("jvm") version "1.9.0"
     kotlin("kapt") version "1.9.0"
     id("org.jlleitschuh.gradle.ktlint") version "11.0.0"
     id("com.github.johnrengelman.shadow") version "8.1.0"
 }
 
-allprojects {
-    group = "io.shulkermc"
-
-    repositories {
-        mavenCentral()
-        maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
-        maven(url = "https://repo.papermc.io/repository/maven-public/")
-    }
+repositories {
+    mavenCentral()
 }
 
 subprojects {
@@ -37,9 +31,17 @@ subprojects {
     apply(plugin = "org.jlleitschuh.gradle.ktlint")
     apply(plugin = "com.github.johnrengelman.shadow")
 
+    group = "io.shulkermc"
+
     project.layout.buildDirectory.set(File("$rootDir/dist/java${project.path.replace(":", "/")}"))
     java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
+    repositories {
+        mavenCentral()
+        maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
+        maven(url = "https://repo.papermc.io/repository/maven-public/")
+    }
+
     dependencies {
         testImplementation(kotlin("test"))
     }

diff --git a/docs/project.json b/docs/project.json
@@ -6,11 +6,11 @@
   "targets": {
     "build": {
       "executor": "nx:run-commands",
-      "outputs": ["{workspaceRoot}/build"],
       "options": {
         "command": "npm run build",
         "cwd": "docs"
-      }
+      },
+      "outputs": ["{workspaceRoot}/build"]
     },
     "serve": {
       "executor": "nx:run-commands",

diff --git a/nx.json b/nx.json
@@ -15,6 +15,7 @@
       "{workspaceRoot}/Cargo.lock",
       "{workspaceRoot}/.cargo/"
     ],
+    "rust:test:dependencies": ["{workspaceRoot}/.tarpaulin.toml"],
     "java:dependencies": [
       "{workspaceRoot}/build.gradle.kts",
       "{workspaceRoot}/gradle.properties",

diff --git a/packages/google-agones-crds/project.json b/packages/google-agones-crds/project.json
@@ -15,10 +15,11 @@
     "test": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "cargo test",
+        "command": "cargo tarpaulin",
         "cwd": "packages/google-agones-crds"
       },
-      "inputs": ["default", "rust:dependencies"]
+      "inputs": ["default", "rust:dependencies", "rust:test:dependencies"],
+      "outputs": ["{workspaceRoot}/coverage/rust/google-agones-sdk"]
     },
     "lint": {
       "executor": "nx:run-commands",

diff --git a/packages/google-agones-crds/tarpaulin.toml b/packages/google-agones-crds/tarpaulin.toml
@@ -0,0 +1,6 @@
+[default]
+skip-clean = true
+
+[report]
+out = ["Xml"]
+output-dir = "../../coverage/rust/google-agones-crds"
diff --git a/packages/google-agones-sdk/bindings/java/project.json b/packages/google-agones-sdk/bindings/java/project.json
@@ -6,11 +6,13 @@
   "targets": {
     "build": {
       "executor": "nx:run-commands",
-      "outputs": ["{workspaceRoot}/dist/packages/google-agones-sdk/bindings/java"],
       "options": {
         "command": "./gradlew :packages:google-agones-sdk-bindings-java:build -x check"
       },
-      "inputs": ["default", "java:dependencies"]
+      "inputs": ["default", "java:dependencies"],
+      "outputs": [
+        "{workspaceRoot}/dist/packages/google-agones-sdk/bindings/java"
+      ]
     },
     "test": {
       "executor": "nx:run-commands",

diff --git a/packages/google-agones-sdk/project.json b/packages/google-agones-sdk/project.json
@@ -11,7 +11,7 @@
         "cwd": "packages/google-agones-sdk"
       },
       "inputs": ["default"],
-      "outputs": ["{projectRoot}/bindings/java/src/generated/"]
+      "outputs": ["{projectRoot}/bindings/java/src/generated"]
     }
   },
   "tags": []

diff --git a/packages/shulker-crds/project.json b/packages/shulker-crds/project.json
@@ -15,10 +15,11 @@
     "test": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "cargo test",
+        "command": "cargo tarpaulin",
         "cwd": "packages/shulker-crds"
       },
-      "inputs": ["default", "rust:dependencies"]
+      "inputs": ["default", "rust:dependencies", "rust:test:dependencies"],
+      "outputs": ["{workspaceRoot}/coverage/rust/shulker-crds"]
     },
     "lint": {
       "executor": "nx:run-commands",

diff --git a/packages/shulker-crds/tarpaulin.toml b/packages/shulker-crds/tarpaulin.toml
@@ -0,0 +1,6 @@
+[default]
+skip-clean = true
+
+[report]
+out = ["Xml"]
+output-dir = "../../coverage/rust/shulker-crds"
diff --git a/packages/shulker-operator/project.json b/packages/shulker-operator/project.json
@@ -15,10 +15,11 @@
     "test": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "cargo test",
+        "command": "cargo tarpaulin",
         "cwd": "packages/shulker-operator"
       },
-      "inputs": ["default", "rust:dependencies"]
+      "inputs": ["default", "rust:dependencies", "rust:test:dependencies"],
+      "outputs": ["{workspaceRoot}/coverage/rust/shulker-operator"]
     },
     "lint": {
       "executor": "nx:run-commands",
@@ -29,6 +30,11 @@
       "inputs": ["default", "rust:dependencies"]
     }
   },
-  "implicitDependencies": ["shulker-crds", "shulker-utils", "google-agones-crds", "shulker-sdk-bindings-rust"],
+  "implicitDependencies": [
+    "shulker-crds",
+    "shulker-utils",
+    "google-agones-crds",
+    "shulker-sdk-bindings-rust"
+  ],
   "tags": ["lang:rust"]
 }
diff --git a/packages/shulker-operator/tarpaulin.toml b/packages/shulker-operator/tarpaulin.toml
@@ -0,0 +1,6 @@
+[default]
+skip-clean = true
+
+[report]
+out = ["Xml"]
+output-dir = "../../coverage/rust/shulker-operator"
diff --git a/packages/shulker-proxy-agent/project.json b/packages/shulker-proxy-agent/project.json
@@ -6,11 +6,11 @@
   "targets": {
     "build": {
       "executor": "nx:run-commands",
-      "outputs": ["{workspaceRoot}/dist/packages/shulker-proxy-agent"],
       "options": {
         "command": "./gradlew :packages:shulker-proxy-agent:build -x check"
       },
-      "inputs": ["default", "java:dependencies"]
+      "inputs": ["default", "java:dependencies"],
+      "outputs": ["{workspaceRoot}/dist/packages/shulker-proxy-agent"]
     },
     "test": {
       "executor": "nx:run-commands",

diff --git a/packages/shulker-sdk/bindings/java/project.json b/packages/shulker-sdk/bindings/java/project.json
@@ -6,11 +6,11 @@
   "targets": {
     "build": {
       "executor": "nx:run-commands",
-      "outputs": ["{workspaceRoot}/dist/packages/shulker-sdk/bindings/java"],
       "options": {
         "command": "./gradlew :packages:shulker-sdk-bindings-java:build -x check"
       },
-      "inputs": ["default", "java:dependencies"]
+      "inputs": ["default", "java:dependencies"],
+      "outputs": ["{workspaceRoot}/dist/packages/shulker-sdk/bindings/java"]
     },
     "test": {
       "executor": "nx:run-commands",

diff --git a/packages/shulker-sdk/bindings/rust/project.json b/packages/shulker-sdk/bindings/rust/project.json
@@ -15,10 +15,11 @@
     "test": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "cargo test",
+        "command": "cargo tarpaulin",
         "cwd": "packages/shulker-sdk/bindings/rust"
       },
-      "inputs": ["default", "rust:dependencies"]
+      "inputs": ["default", "rust:dependencies", "rust:test:dependencies"],
+      "outputs": ["{workspaceRoot}/coverage/rust/shulker-sdk-bindings/rust"]
     },
     "lint": {
       "executor": "nx:run-commands",

diff --git a/packages/shulker-sdk/bindings/rust/tarpaulin.toml b/packages/shulker-sdk/bindings/rust/tarpaulin.toml
@@ -0,0 +1,6 @@
+[default]
+skip-clean = true
+
+[report]
+out = ["Xml"]
+output-dir = "../../coverage/rust/shulker-sdk-bindings-rust"
diff --git a/packages/shulker-sdk/project.json b/packages/shulker-sdk/project.json
@@ -12,8 +12,8 @@
       },
       "inputs": ["default"],
       "outputs": [
-        "{projectRoot}/bindings/java/src/generated/",
-        "{projectRoot}/bindings/rust/src/gen/"
+        "{projectRoot}/bindings/java/src/generated",
+        "{projectRoot}/bindings/rust/src/gen"
       ]
     }
   },

diff --git a/packages/shulker-server-api/project.json b/packages/shulker-server-api/project.json
@@ -6,11 +6,11 @@
   "targets": {
     "build": {
       "executor": "nx:run-commands",
-      "outputs": ["{workspaceRoot}/dist/packages/shulker-server-api"],
       "options": {
         "command": "./gradlew :packages:shulker-server-api:build -x check"
       },
-      "inputs": ["default", "java:dependencies"]
+      "inputs": ["default", "java:dependencies"],
+      "outputs": ["{workspaceRoot}/dist/packages/shulker-server-api"]
     },
     "test": {
       "executor": "nx:run-commands",

diff --git a/packages/shulker-utils/project.json b/packages/shulker-utils/project.json
@@ -15,10 +15,11 @@
     "test": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "cargo test",
+        "command": "cargo tarpaulin",
         "cwd": "packages/shulker-utils"
       },
-      "inputs": ["default", "rust:dependencies"]
+      "inputs": ["default", "rust:dependencies", "rust:test:dependencies"],
+      "outputs": ["{workspaceRoot}/coverage/rust/shulker-utils"]
     },
     "lint": {
       "executor": "nx:run-commands",

diff --git a/packages/shulker-utils/tarpaulin.toml b/packages/shulker-utils/tarpaulin.toml
@@ -0,0 +1,6 @@
+[default]
+skip-clean = true
+
+[report]
+out = ["Xml"]
+output-dir = "../../coverage/rust/shulker-utils"