diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index bcfe8b6be5..4b796a5582 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -903,7 +903,7 @@ jobs: needs: - orchestrate - check_style - if: needs.orchestrate.outputs.run_tests == 'true' + if: needs.orchestrate.outputs.run_tests == 'true' && github.event_name != 'merge_group' runs-on: namespace-profile-mac-large steps: - name: steps::checkout_repo @@ -933,7 +933,7 @@ jobs: needs: - orchestrate - check_style - if: needs.orchestrate.outputs.run_tests == 'true' + if: needs.orchestrate.outputs.run_tests == 'true' && github.event_name != 'merge_group' runs-on: self-32vcpu-windows-2022 steps: - name: steps::checkout_repo diff --git a/tooling/xtask/src/tasks/workflows/run_tests.rs b/tooling/xtask/src/tasks/workflows/run_tests.rs index 162daa3edd..e93358b5fe 100644 --- a/tooling/xtask/src/tasks/workflows/run_tests.rs +++ b/tooling/xtask/src/tasks/workflows/run_tests.rs @@ -100,11 +100,12 @@ pub(crate) fn run_tests() -> Workflow { (Platform::Mac, Arch::AARCH64), (Platform::Windows, Arch::X86_64), ] { - jobs.push( - should_run_tests - .and_always() - .then(check_remote_server(platform, arch)), - ); + let condition = if platform == Platform::Linux { + should_run_tests.and_always() + } else { + should_run_tests.and_not_in_merge_queue() + }; + jobs.push(condition.then(check_remote_server(platform, arch))); } let ext_tests = extension_tests(); let tests_pass = tests_pass(&jobs, &[&ext_tests.name]);