From c20a43eb7b7d57f2437f66e3c34243778ce070f2 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Wed, 16 Sep 2026 08:07:56 +0000 Subject: [PATCH] Check dependencies in merge queue (#64286) Fall out of https://github.com/zed-industries/zed/pull/63248 's changes getting missing the merge queue lockfile check. Release Notes: - N/A --- .github/workflows/run_tests.yml | 2 +- Cargo.lock | 2 +- tooling/xtask/src/tasks/workflows/run_tests.rs | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 8ea0969177..dbce5d5c69 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 d6b292a6f0..17f5da60be 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 0b5d8d5db5..033562863e 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()),