Skip to content

Commit 9dac479

Browse files
committed
Remove double nesting in post-merge workflow
1 parent 259fdb5 commit 9dac479

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)