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.

Check dependencies in merge queue (#64286)

Kirill Bulatov0e7972f38ed5
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 8ea0969177f..dbce5d5c695 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -683,7 +683,7 @@ jobs:
check_dependencies:
needs:
- orchestrate
- if: needs.orchestrate.outputs.run_tests == 'true' && github.event_name != 'merge_group'
+ if: needs.orchestrate.outputs.run_tests == 'true'
runs-on: namespace-profile-2x4-ubuntu-2404
env:
CC: clang
diff --git a/Cargo.lock b/Cargo.lock
index d6b292a6f0a..17f5da60be2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22539,7 +22539,7 @@ dependencies = [
"anyhow",
"base64 0.22.1",
"credentials_provider",
- "futures 0.3.32",
+ "futures 0.3.34",
"gpui",
"http_client",
"language_model",
diff --git a/tooling/xtask/src/tasks/workflows/run_tests.rs b/tooling/xtask/src/tasks/workflows/run_tests.rs
index 0b5d8d5db55..033562863ea 100644
--- a/tooling/xtask/src/tasks/workflows/run_tests.rs
+++ b/tooling/xtask/src/tasks/workflows/run_tests.rs
@@ -83,9 +83,7 @@ pub(crate) fn run_tests() -> Workflow {
.and_not_in_merge_queue()
.then(build_visual_tests_binary()),
should_run_tests.and_not_in_merge_queue().then(check_wasm()),
- should_run_tests
- .and_not_in_merge_queue()
- .then(check_dependencies()), // could be more specific here?
+ should_run_tests.and_always().then(check_dependencies()), // could be more specific here?
should_check_docs
.and_not_in_merge_queue()
.then(deploy_docs::check_docs()),