diff --git a/.github/actions/run_tests/action.yml b/.github/actions/run_tests/action.yml index 3bc28249f3b8b2a08a48be040177530c5ecfd407..a071aba3a87dcf8e8f48f740115cfddf48b9f805 100644 --- a/.github/actions/run_tests/action.yml +++ b/.github/actions/run_tests/action.yml @@ -4,10 +4,8 @@ description: "Runs the tests" runs: using: "composite" steps: - - name: Install Rust - shell: bash -euxo pipefail {0} - run: | - cargo install cargo-nextest --locked + - name: Install nextest + uses: taiki-e/install-action@nextest - name: Install Node uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 diff --git a/.github/actions/run_tests_windows/action.yml b/.github/actions/run_tests_windows/action.yml index d85d47cb969e22ca3c73c9ab8caca279a9b5ba88..307b73f363b7d5fd7a3c9e5082c4f17d622ec165 100644 --- a/.github/actions/run_tests_windows/action.yml +++ b/.github/actions/run_tests_windows/action.yml @@ -11,9 +11,8 @@ runs: using: "composite" steps: - name: Install test runner - shell: powershell working-directory: ${{ inputs.working-directory }} - run: cargo install cargo-nextest --locked + uses: taiki-e/install-action@nextest - name: Install Node uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 diff --git a/.github/workflows/bump_patch_version.yml b/.github/workflows/bump_patch_version.yml index bfaf7a271b5e31b60c999c7dcf8d17538d135355..e1ae890043f31269a9c894f9f8ba408b3db81ffb 100644 --- a/.github/workflows/bump_patch_version.yml +++ b/.github/workflows/bump_patch_version.yml @@ -42,7 +42,7 @@ jobs: exit 1 ;; esac - which cargo-set-version > /dev/null || cargo install cargo-edit + which cargo-set-version > /dev/null || cargo install cargo-edit -f --no-default-features --features "set-version" output="$(cargo set-version -p zed --bump patch 2>&1 | sed 's/.* //')" export GIT_COMMITTER_NAME="Zed Bot" export GIT_COMMITTER_EMAIL="hi@zed.dev" diff --git a/.github/workflows/compare_perf.yml b/.github/workflows/compare_perf.yml index 5bcb733f3f21c95e530d7c221df080997dfc24eb..48fc850f8f039d5c25071ba91381ea9f905ab811 100644 --- a/.github/workflows/compare_perf.yml +++ b/.github/workflows/compare_perf.yml @@ -39,8 +39,7 @@ jobs: run: ./script/download-wasi-sdk shell: bash -euxo pipefail {0} - name: compare_perf::run_perf::install_hyperfine - run: cargo install hyperfine - shell: bash -euxo pipefail {0} + uses: taiki-e/install-action@hyperfine - name: steps::git_checkout run: git fetch origin ${{ inputs.base }} && git checkout ${{ inputs.base }} shell: bash -euxo pipefail {0} diff --git a/.github/workflows/deploy_collab.yml b/.github/workflows/deploy_collab.yml index c61879faa8cd0a5dbdbed03a140f8e558f13322b..ce0c0eac40c8c34992f8838af396e75e6cecc0c8 100644 --- a/.github/workflows/deploy_collab.yml +++ b/.github/workflows/deploy_collab.yml @@ -43,9 +43,7 @@ jobs: fetch-depth: 0 - name: Install cargo nextest - shell: bash -euxo pipefail {0} - run: | - cargo install cargo-nextest --locked + uses: taiki-e/install-action@nextest - name: Limit target directory size shell: bash -euxo pipefail {0} diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs index f1b205f83a6bd3a9b26cb39da854817ebba11361..c2b0845940d1639629d59b634e9ece73c9e4cf3a 100644 --- a/crates/languages/src/rust.rs +++ b/crates/languages/src/rust.rs @@ -442,7 +442,7 @@ impl LspInstaller for RustLspAdapter { // It is surprisingly common for ~/.cargo/bin/rust-analyzer to be a symlink to // /usr/bin/rust-analyzer that fails when you run it; so we need to test it. - log::info!("found rust-analyzer in PATH. trying to run `rust-analyzer --help`"); + log::debug!("found rust-analyzer in PATH. trying to run `rust-analyzer --help`"); let result = delegate .try_exec(LanguageServerBinary { path: path.clone(), diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs index 01318a7636bb42916f115ad55339ff4df0937e83..422d8bbbf72a68668221ad3ee7ff2a9dc9947d45 100644 --- a/crates/zed/src/main.rs +++ b/crates/zed/src/main.rs @@ -341,7 +341,9 @@ pub fn main() { } else { None }; - log::info!("Using git binary path: {:?}", git_binary_path); + if let Some(git_binary_path) = &git_binary_path { + log::info!("Using git binary path: {:?}", git_binary_path); + } let fs = Arc::new(RealFs::new(git_binary_path, app.background_executor())); let user_settings_file_rx = watch_config_file( diff --git a/tooling/xtask/src/tasks/workflows/compare_perf.rs b/tooling/xtask/src/tasks/workflows/compare_perf.rs index b1d6e0c60bd6b49893de8877e7d1fd51e5967679..db9f21de15fe159c369ad603e3ab0ff93e1cc7f9 100644 --- a/tooling/xtask/src/tasks/workflows/compare_perf.rs +++ b/tooling/xtask/src/tasks/workflows/compare_perf.rs @@ -35,8 +35,8 @@ pub fn run_perf(base: &Input, head: &Input, crate_name: &Input) -> NamedJob { )) } - fn install_hyperfine() -> Step { - named::bash("cargo install hyperfine") + fn install_hyperfine() -> Step { + named::uses("taiki-e", "install-action", "hyperfine") } fn compare_runs(head: &Input, base: &Input) -> Step {