Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Ensure that clippy fixes can be disabled for the autofix workflow (#62781)
Finn Eversaa3718614b3a
diff --git a/.github/workflows/autofix_pr.yml b/.github/workflows/autofix_pr.ymlindex 1b05da60857..d75449c9add 100644--- a/.github/workflows/autofix_pr.yml+++ b/.github/workflows/autofix_pr.yml@@ -12,7 +12,7 @@ on:run_clippy:description: run_clippytype: boolean- default: 'true'+ default: 'false'permissions:contents: readjobs:@@ -52,18 +52,18 @@ jobs:with:version: '9'- name: autofix_pr::run_autofix::install_cargo_machete- if: ${{ inputs.run_clippy }}+ if: inputs.run_clippy == true || inputs.run_clippy == 'true'uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9with:tool: [email protected]- name: autofix_pr::run_autofix::run_cargo_fix- if: ${{ inputs.run_clippy }}+ if: inputs.run_clippy == true || inputs.run_clippy == 'true'run: cargo fix --workspace --allow-dirty --allow-staged- name: autofix_pr::run_autofix::run_cargo_machete_fix- if: ${{ inputs.run_clippy }}+ if: inputs.run_clippy == true || inputs.run_clippy == 'true'run: cargo machete --fix- name: autofix_pr::run_autofix::run_clippy_fix- if: ${{ inputs.run_clippy }}+ if: inputs.run_clippy == true || inputs.run_clippy == 'true'run: cargo clippy --workspace --fix --allow-dirty --allow-staged- name: autofix_pr::run_autofix::run_prettier_fixrun: ./script/prettier --writediff --git a/tooling/xtask/src/tasks/workflows/autofix_pr.rs b/tooling/xtask/src/tasks/workflows/autofix_pr.rsindex 60c66459118..24cd0f7991e 100644--- a/tooling/xtask/src/tasks/workflows/autofix_pr.rs+++ b/tooling/xtask/src/tasks/workflows/autofix_pr.rs@@ -11,7 +11,7 @@ use crate::tasks::workflows::{pub fn autofix_pr() -> Workflow {let pr_number = WorkflowInput::string("pr_number", None);- let run_clippy = WorkflowInput::bool("run_clippy", Some(true));+ let run_clippy = WorkflowInput::bool("run_clippy", Some(false));let run_autofix = run_autofix(&pr_number, &run_clippy);let commit_changes = commit_changes(&pr_number, &run_autofix);named::workflow()@@ -46,6 +46,15 @@ fn download_patch_artifact() -> DownloadArtifactStep {}fn run_autofix(pr_number: &WorkflowInput, run_clippy: &WorkflowInput) -> NamedJob {+ // Dispatches via the REST API/CLI can deliver boolean inputs as strings, and the+ // non-empty string 'false' is truthy in expressions, so compare against both forms.+ fn clippy_enabled(run_clippy: &WorkflowInput) -> Expression {+ Expression::new(format!(+ "{expr} == true || {expr} == 'true'",+ expr = run_clippy.expr()+ ))+ }+fn checkout_pr(pr_number: &WorkflowInput) -> Step<Run> {named::bash(r#"gh pr checkout "$PR_NUMBER""#).add_env(("PR_NUMBER", pr_number.to_string()))@@ -107,10 +116,10 @@ fn run_autofix(pr_number: &WorkflowInput, run_clippy: &WorkflowInput) -> NamedJo.add_step(steps::cache_rust_dependencies_namespace()).map(steps::install_linux_dependencies).add_step(steps::setup_pnpm())- .add_step(install_cargo_machete().if_condition(Expression::new(run_clippy.to_string())))- .add_step(run_cargo_fix().if_condition(Expression::new(run_clippy.to_string())))- .add_step(run_cargo_machete_fix().if_condition(Expression::new(run_clippy.to_string())))- .add_step(run_clippy_fix().if_condition(Expression::new(run_clippy.to_string())))+ .add_step(install_cargo_machete().if_condition(clippy_enabled(run_clippy)))+ .add_step(run_cargo_fix().if_condition(clippy_enabled(run_clippy)))+ .add_step(run_cargo_machete_fix().if_condition(clippy_enabled(run_clippy)))+ .add_step(run_clippy_fix().if_condition(clippy_enabled(run_clippy))).add_step(run_prettier_fix()).add_step(run_cargo_fmt()).add_step(create_patch())