Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 09c28f8

Browse files
authoredMar 19, 2025
Rollup merge of #138656 - Kobzol:post-merge-unnest, r=marcoieni
Remove double nesting in post-merge workflow See [this](#138630 (comment)) :) Can be tested with: ```bash #!/bin/bash PARENT_COMMIT=493c38ba371929579fe136df26eccd9516347c7a SHA=259fdb521200c9abba547302fc2c826479ef26b2 printf "<details>\n<summary>What is this?</summary>\n" >> output.log printf "This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.\n" >> output.log printf "</details>\n\n" >> output.log cargo run --release post-merge-report ${PARENT_COMMIT} ${SHA} >> output.log ``` I think that it's better to leave the notice in CI, to avoid generating it in citool, which can also be executed locally. r? `@marcoieni`
2 parents 67d3e5e + 9dac479 commit 09c28f8

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed
 

‎.github/workflows/post-merge.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,12 @@ jobs:
3535
3636
cd src/ci/citool
3737
38-
printf "*This is an experimental post-merge analysis report. You can ignore it.*\n\n" > output.log
39-
printf "<details>\n<summary>Post-merge report</summary>\n\n" >> output.log
38+
printf "<details>\n<summary>What is this?</summary>\n" >> output.log
39+
printf "This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.\n" >> output.log
40+
printf "</details>\n\n" >> output.log
4041
4142
cargo run --release post-merge-report ${PARENT_COMMIT} ${{ github.sha }} >> output.log
4243
43-
printf "</details>\n" >> output.log
44-
4544
cat output.log
4645
4746
gh pr comment ${HEAD_PR} -F output.log

‎src/ci/citool/src/main.rs

+1-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use crate::cpu_usage::load_cpu_usage;
2020
use crate::datadog::upload_datadog_metric;
2121
use crate::jobs::RunType;
2222
use crate::metrics::{JobMetrics, download_auto_job_metrics, download_job_metrics, load_metrics};
23-
use crate::utils::{load_env_var, output_details};
23+
use crate::utils::load_env_var;
2424

2525
const CI_DIRECTORY: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/..");
2626
const DOCKER_DIRECTORY: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../docker");
@@ -175,13 +175,6 @@ fn postprocess_metrics(
175175
fn post_merge_report(db: JobDatabase, current: String, parent: String) -> anyhow::Result<()> {
176176
let metrics = download_auto_job_metrics(&db, &parent, &current)?;
177177

178-
output_details("What is this?", || {
179-
println!(
180-
r#"This is an experimental post-merge analysis report that shows differences in
181-
test outcomes between the merged PR and its parent PR."#
182-
);
183-
});
184-
185178
println!("\nComparing {parent} (parent) -> {current} (this PR)\n");
186179
output_test_diffs(metrics);
187180

0 commit comments

Comments
 (0)
Failed to load comments.