From 9dd7c019fe9a31450b08e2639e777a40ae426c64 Mon Sep 17 00:00:00 2001 From: bit-aloo Date: Wed, 11 Jun 2025 13:30:53 +0530 Subject: [PATCH 1/4] add trace_cmd import in tracing feature in execution context --- src/bootstrap/src/utils/execution_context.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bootstrap/src/utils/execution_context.rs b/src/bootstrap/src/utils/execution_context.rs index d12c02c161dfa..a5e1e9bcc07df 100644 --- a/src/bootstrap/src/utils/execution_context.rs +++ b/src/bootstrap/src/utils/execution_context.rs @@ -6,6 +6,8 @@ use std::sync::{Arc, Mutex}; use crate::core::config::DryRun; +#[cfg(feature = "tracing")] +use crate::trace_cmd; use crate::{BehaviorOnFailure, BootstrapCommand, CommandOutput, OutputMode, exit}; #[derive(Clone, Default)] From 052a7c56188030effb7c9fd34524cd65a5849fb4 Mon Sep 17 00:00:00 2001 From: bit-aloo Date: Wed, 11 Jun 2025 13:31:41 +0530 Subject: [PATCH 2/4] add tracing flag in bootstrap check cmd in mingw-check-2 ci workflow --- src/ci/docker/host-x86_64/mingw-check-2/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile b/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile index a1d04bd984c6e..2aeb26153c2d6 100644 --- a/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile +++ b/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile @@ -27,7 +27,7 @@ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh ENV SCRIPT \ - python3 ../x.py check && \ + BOOTSTRAP_TRACING=bootstrap=TRACE python3 ../x.py check && \ python3 ../x.py clippy ci && \ python3 ../x.py test --stage 1 core alloc std test proc_macro && \ python3 ../x.py doc --stage 0 bootstrap && \ From 8c236ab51e9d0df6501a59a1bf8e680dd05bf8ec Mon Sep 17 00:00:00 2001 From: bit-aloo Date: Wed, 11 Jun 2025 13:48:50 +0530 Subject: [PATCH 3/4] add comment over ci change --- src/ci/docker/host-x86_64/mingw-check-2/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile b/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile index 2aeb26153c2d6..cd61d1d752d92 100644 --- a/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile +++ b/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile @@ -27,7 +27,9 @@ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh ENV SCRIPT \ - BOOTSTRAP_TRACING=bootstrap=TRACE python3 ../x.py check && \ + # The BOOTSTRAP_TRACING flag is added to verify whether the + # bootstrap process compiles successfully with this flag enabled. + BOOTSTRAP_TRACING=1 python3 ../x.py check && \ python3 ../x.py clippy ci && \ python3 ../x.py test --stage 1 core alloc std test proc_macro && \ python3 ../x.py doc --stage 0 bootstrap && \ From d4d90ca3d26f9f620a55561e31f3ee3923efe190 Mon Sep 17 00:00:00 2001 From: bit-aloo Date: Wed, 11 Jun 2025 16:01:40 +0530 Subject: [PATCH 4/4] put flag check at the end of command chain in mingw-check-2 --- src/ci/docker/host-x86_64/mingw-check-2/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile b/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile index cd61d1d752d92..ce18a181d313d 100644 --- a/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile +++ b/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile @@ -27,9 +27,7 @@ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh ENV SCRIPT \ - # The BOOTSTRAP_TRACING flag is added to verify whether the - # bootstrap process compiles successfully with this flag enabled. - BOOTSTRAP_TRACING=1 python3 ../x.py check && \ + python3 ../x.py check && \ python3 ../x.py clippy ci && \ python3 ../x.py test --stage 1 core alloc std test proc_macro && \ python3 ../x.py doc --stage 0 bootstrap && \ @@ -38,4 +36,7 @@ ENV SCRIPT \ RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 1 library && \ mkdir -p /checkout/obj/staging/doc && \ cp -r build/x86_64-unknown-linux-gnu/doc /checkout/obj/staging && \ - RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 1 library/test + RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 1 library/test && \ + # The BOOTSTRAP_TRACING flag is added to verify whether the + # bootstrap process compiles successfully with this flag enabled. + BOOTSTRAP_TRACING=1 python3 ../x.py --help