Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

ci: Fix autofix workflow (#55004)

Finn Eversd459a3ae5583
diff --git a/.github/workflows/autofix_pr.yml b/.github/workflows/autofix_pr.yml
index 4c0b4ac378c..5e4fe70439b 100644
--- a/.github/workflows/autofix_pr.yml
+++ b/.github/workflows/autofix_pr.yml
@@ -16,6 +16,9 @@ on:
jobs:
run_autofix:
runs-on: namespace-profile-16x32-ubuntu-2204
+ env:
+ CC: clang
+ CXX: clang++
steps:
- name: steps::checkout_repo
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
@@ -50,13 +53,13 @@ jobs:
- name: autofix_pr::run_autofix::run_cargo_fix
if: ${{ inputs.run_clippy }}
- run: cargo fix --workspace --release --all-targets --all-features --allow-dirty --allow-staged
+ run: cargo fix --workspace --allow-dirty --allow-staged
- name: autofix_pr::run_autofix::run_cargo_machete_fix
if: ${{ inputs.run_clippy }}
run: cargo machete --fix
- name: autofix_pr::run_autofix::run_clippy_fix
if: ${{ inputs.run_clippy }}
- run: cargo clippy --workspace --release --all-targets --all-features --fix --allow-dirty --allow-staged
+ run: cargo clippy --workspace --fix --allow-dirty --allow-staged
- name: autofix_pr::run_autofix::run_prettier_fix
run: ./script/prettier --write
- name: autofix_pr::run_autofix::run_cargo_fmt
diff --git a/tooling/xtask/src/tasks/workflows/autofix_pr.rs b/tooling/xtask/src/tasks/workflows/autofix_pr.rs
index c2791aba090..cc6563b6cb5 100644
--- a/tooling/xtask/src/tasks/workflows/autofix_pr.rs
+++ b/tooling/xtask/src/tasks/workflows/autofix_pr.rs
@@ -2,7 +2,7 @@ use gh_workflow::*;
use crate::tasks::workflows::{
runners,
- steps::{self, FluentBuilder, NamedJob, RepositoryTarget, TokenPermissions, named},
+ steps::{self, FluentBuilder, NamedJob, RepositoryTarget, TokenPermissions, named, use_clang},
vars::{self, StepOutput, WorkflowInput},
};
@@ -69,9 +69,7 @@ fn run_autofix(pr_number: &WorkflowInput, run_clippy: &WorkflowInput) -> NamedJo
}
fn run_cargo_fix() -> Step<Run> {
- named::bash(
- "cargo fix --workspace --release --all-targets --all-features --allow-dirty --allow-staged",
- )
+ named::bash("cargo fix --workspace --allow-dirty --allow-staged")
}
fn run_cargo_machete_fix() -> Step<Run> {
@@ -79,9 +77,7 @@ fn run_autofix(pr_number: &WorkflowInput, run_clippy: &WorkflowInput) -> NamedJo
}
fn run_clippy_fix() -> Step<Run> {
- named::bash(
- "cargo clippy --workspace --release --all-targets --all-features --fix --allow-dirty --allow-staged",
- )
+ named::bash("cargo clippy --workspace --fix --allow-dirty --allow-staged")
}
fn run_prettier_fix() -> Step<Run> {
@@ -101,7 +97,7 @@ fn run_autofix(pr_number: &WorkflowInput, run_clippy: &WorkflowInput) -> NamedJo
.id("create-patch")
}
- named::job(
+ named::job(use_clang(
Job::default()
.runs_on(runners::LINUX_DEFAULT)
.outputs([(
@@ -123,7 +119,7 @@ fn run_autofix(pr_number: &WorkflowInput, run_clippy: &WorkflowInput) -> NamedJo
.add_step(create_patch())
.add_step(upload_patch_artifact())
.add_step(steps::cleanup_cargo_config(runners::Platform::Linux)),
- )
+ ))
}
fn commit_changes(pr_number: &WorkflowInput, autofix_job: &NamedJob) -> NamedJob {