Skip to content

Commit 46ad6c0

Browse files
authored
ci: Remove remaining nextest compiles (#42630)
Follow up to #42556 Release Notes: - N/A *or* Added/Fixed/Improved ...
1 parent 671500d commit 46ad6c0

File tree

8 files changed

+12
-16
lines changed

8 files changed

+12
-16
lines changed

.github/actions/run_tests/action.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ description: "Runs the tests"
44
runs:
55
using: "composite"
66
steps:
7-
- name: Install Rust
8-
shell: bash -euxo pipefail {0}
9-
run: |
10-
cargo install cargo-nextest --locked
7+
- name: Install nextest
8+
uses: taiki-e/install-action@nextest
119

1210
- name: Install Node
1311
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4

.github/actions/run_tests_windows/action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ runs:
1111
using: "composite"
1212
steps:
1313
- name: Install test runner
14-
shell: powershell
1514
working-directory: ${{ inputs.working-directory }}
16-
run: cargo install cargo-nextest --locked
15+
uses: taiki-e/install-action@nextest
1716

1817
- name: Install Node
1918
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4

.github/workflows/bump_patch_version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
exit 1
4343
;;
4444
esac
45-
which cargo-set-version > /dev/null || cargo install cargo-edit
45+
which cargo-set-version > /dev/null || cargo install cargo-edit -f --no-default-features --features "set-version"
4646
output="$(cargo set-version -p zed --bump patch 2>&1 | sed 's/.* //')"
4747
export GIT_COMMITTER_NAME="Zed Bot"
4848
export GIT_COMMITTER_EMAIL="hi@zed.dev"

.github/workflows/compare_perf.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ jobs:
3939
run: ./script/download-wasi-sdk
4040
shell: bash -euxo pipefail {0}
4141
- name: compare_perf::run_perf::install_hyperfine
42-
run: cargo install hyperfine
43-
shell: bash -euxo pipefail {0}
42+
uses: taiki-e/install-action@hyperfine
4443
- name: steps::git_checkout
4544
run: git fetch origin ${{ inputs.base }} && git checkout ${{ inputs.base }}
4645
shell: bash -euxo pipefail {0}

.github/workflows/deploy_collab.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ jobs:
4343
fetch-depth: 0
4444

4545
- name: Install cargo nextest
46-
shell: bash -euxo pipefail {0}
47-
run: |
48-
cargo install cargo-nextest --locked
46+
uses: taiki-e/install-action@nextest
4947

5048
- name: Limit target directory size
5149
shell: bash -euxo pipefail {0}

crates/languages/src/rust.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ impl LspInstaller for RustLspAdapter {
442442

443443
// It is surprisingly common for ~/.cargo/bin/rust-analyzer to be a symlink to
444444
// /usr/bin/rust-analyzer that fails when you run it; so we need to test it.
445-
log::info!("found rust-analyzer in PATH. trying to run `rust-analyzer --help`");
445+
log::debug!("found rust-analyzer in PATH. trying to run `rust-analyzer --help`");
446446
let result = delegate
447447
.try_exec(LanguageServerBinary {
448448
path: path.clone(),

crates/zed/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,9 @@ pub fn main() {
341341
} else {
342342
None
343343
};
344-
log::info!("Using git binary path: {:?}", git_binary_path);
344+
if let Some(git_binary_path) = &git_binary_path {
345+
log::info!("Using git binary path: {:?}", git_binary_path);
346+
}
345347

346348
let fs = Arc::new(RealFs::new(git_binary_path, app.background_executor()));
347349
let user_settings_file_rx = watch_config_file(

tooling/xtask/src/tasks/workflows/compare_perf.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ pub fn run_perf(base: &Input, head: &Input, crate_name: &Input) -> NamedJob {
3535
))
3636
}
3737

38-
fn install_hyperfine() -> Step<Run> {
39-
named::bash("cargo install hyperfine")
38+
fn install_hyperfine() -> Step<Use> {
39+
named::uses("taiki-e", "install-action", "hyperfine")
4040
}
4141

4242
fn compare_runs(head: &Input, base: &Input) -> Step<Run> {

0 commit comments

Comments
 (0)