Separate test/clippy features

godot-rust · Nov 4, 2024 · b18c6ce · b18c6ce
1 parent e36c746
commit b18c6ce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/full-ci.yml b/.github/workflows/full-ci.yml
@@ -13,7 +13,8 @@ on:
 
 
 env:
-  GDEXT_FEATURES: '--features godot/register-docs'
+  CLIPPY_FEATURES: '--features godot/register-docs'
+  TEST_FEATURES: ''
   RETRY: ${{ github.workspace }}/.github/other/retry.sh
 
   # ASan options: https://github.com/google/sanitizers/wiki/AddressSanitizerFlags
@@ -99,7 +100,7 @@ jobs:
       # Note: could use `-- --no-deps` to not lint dependencies, however it doesn't really speed up and also skips deps in workspace.
       - name: "Check clippy"
         run: |
-          cargo clippy --all-targets $GDEXT_FEATURES -- \
+          cargo clippy --all-targets $CLIPPY_FEATURES -- \
           -D clippy::suspicious \
           -D clippy::style \
           -D clippy::complexity \
@@ -161,10 +162,10 @@ jobs:
         run: cargo +nightly update -Z minimal-versions
 
       - name: "Compile tests"
-        run: cargo test $GDEXT_FEATURES --no-run ${{ matrix.rust-extra-args }}
+        run: cargo test $TEST_FEATURES --no-run ${{ matrix.rust-extra-args }}
 
       - name: "Test"
-        run: cargo test $GDEXT_FEATURES ${{ matrix.rust-extra-args }}
+        run: cargo test $TEST_FEATURES ${{ matrix.rust-extra-args }}
 
 
   miri-test:

diff --git a/.github/workflows/minimal-ci.yml b/.github/workflows/minimal-ci.yml
@@ -21,7 +21,8 @@ on:
 
 
 env:
-  GDEXT_FEATURES: '--features godot/register-docs'
+  CLIPPY_FEATURES: '--features godot/register-docs'
+  TEST_FEATURES: ''
   #  GDEXT_CRATE_ARGS: '-p godot-codegen -p godot-ffi -p godot-core -p godot-macros -p godot'
   RETRY: ${{ github.workspace }}/.github/other/retry.sh
 
@@ -95,7 +96,7 @@ jobs:
 
       - name: "Check clippy"
         run: |
-          cargo clippy --all-targets $GDEXT_FEATURES -- \
+          cargo clippy --all-targets $CLIPPY_FEATURES -- \
           -D clippy::suspicious \
           -D clippy::style \
           -D clippy::complexity \
@@ -119,10 +120,10 @@ jobs:
         uses: ./.github/composite/rust
 
       - name: "Compile tests"
-        run: cargo test $GDEXT_FEATURES --no-run
+        run: cargo test $TEST_FEATURES --no-run
 
       - name: "Test"
-        run: cargo test $GDEXT_FEATURES
+        run: cargo test $TEST_FEATURES
 
 
   # For complex matrix workflow, see https://stackoverflow.com/a/65434401