Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into andreas/generated-arc…
Browse files Browse the repository at this point in the history
…hetype-index-doc-page
  • Loading branch information
Wumpf committed Apr 16, 2024
2 parents 35304d3 + 279c73f commit d5c8340
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions scripts/ci/rust_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ def run_cargo(cargo_cmd, cargo_args: str, clippy_conf: str | None = None) -> Tim
env["RUSTFLAGS"] = "--deny warnings"
env["RUSTDOCFLAGS"] = "--deny warnings --deny rustdoc::missing_crate_level_docs"
if clippy_conf is not None:
env["CLIPPY_CONF_DIR"] = clippy_conf
env["CLIPPY_CONF_DIR"] = (
f"{os.getcwd()}/{clippy_conf}" # Clippy has issues finding this directory on CI when we're not using an absolute path here.
)

result = subprocess.run(args, env=env, check=False, capture_output=True, text=True)
if result.returncode != 0:
Expand Down Expand Up @@ -112,7 +114,7 @@ def main() -> None:
run_cargo(
"cranky",
"--all-features --target wasm32-unknown-unknown --target-dir target_wasm -p re_viewer -- --deny warnings",
clippy_conf="scripts/clippy_wasm", # Use scripts/clippy_wasm/clippy.toml
clippy_conf="scripts/clippy_wasm", # Use ./scripts/clippy_wasm/clippy.toml
)
)
# Check re_renderer examples for wasm32.
Expand Down

0 comments on commit d5c8340

Please sign in to comment.