Added 'Get contnet hash' step to display computed content hash
Bug: https://github.com/flutter/flutter/issues/176838
Change-Id: I9ace57b64b8c9c8f9d6d8de64e17facf171d4675
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/71140
Reviewed-by: John McDole <codefu@google.com>
Commit-Queue: Dmitry Grand <dmgr@google.com>
diff --git a/recipes/release/release_builder.expected/base_linux_beta_monorepo.json b/recipes/release/release_builder.expected/base_linux_beta_monorepo.json
index ff8bd4b..a1ecb4d 100644
--- a/recipes/release/release_builder.expected/base_linux_beta_monorepo.json
+++ b/recipes/release/release_builder.expected/base_linux_beta_monorepo.json
@@ -274,6 +274,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -290,7 +294,18 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@abc123@@@"
+ ]
},
{
"cmd": [
@@ -515,6 +530,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -531,9 +553,16 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
diff --git a/recipes/release/release_builder.expected/base_linux_main_monorepo.json b/recipes/release/release_builder.expected/base_linux_main_monorepo.json
index 38f7c2e..b6f29dd 100644
--- a/recipes/release/release_builder.expected/base_linux_main_monorepo.json
+++ b/recipes/release/release_builder.expected/base_linux_main_monorepo.json
@@ -274,6 +274,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -290,7 +294,18 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@abc123@@@"
+ ]
},
{
"cmd": [
@@ -515,6 +530,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -531,9 +553,16 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
diff --git a/recipes/release/release_builder.expected/filter_disabled_by_top_level_target.json b/recipes/release/release_builder.expected/filter_disabled_by_top_level_target.json
index b48a696..1fa4c7b 100644
--- a/recipes/release/release_builder.expected/filter_disabled_by_top_level_target.json
+++ b/recipes/release/release_builder.expected/filter_disabled_by_top_level_target.json
@@ -274,6 +274,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -290,7 +294,18 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@abc123@@@"
+ ]
},
{
"cmd": [
@@ -515,6 +530,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -531,9 +553,16 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
diff --git a/recipes/release/release_builder.expected/filter_enabled_branches.json b/recipes/release/release_builder.expected/filter_enabled_branches.json
index 5c640a2..d50f13f 100644
--- a/recipes/release/release_builder.expected/filter_enabled_branches.json
+++ b/recipes/release/release_builder.expected/filter_enabled_branches.json
@@ -274,6 +274,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -290,7 +294,18 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@abc123@@@"
+ ]
},
{
"cmd": [
@@ -515,6 +530,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -531,9 +553,16 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
diff --git a/recipes/release/release_builder.expected/filter_enabled_by_top_level_target.json b/recipes/release/release_builder.expected/filter_enabled_by_top_level_target.json
index 08f581a..ae9ad97 100644
--- a/recipes/release/release_builder.expected/filter_enabled_by_top_level_target.json
+++ b/recipes/release/release_builder.expected/filter_enabled_by_top_level_target.json
@@ -274,6 +274,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -290,7 +294,18 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@abc123@@@"
+ ]
},
{
"cmd": [
@@ -515,6 +530,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -531,9 +553,16 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
diff --git a/recipes/release/release_builder.expected/filter_git_ref_not_stable_or_beta_on_release_channel.json b/recipes/release/release_builder.expected/filter_git_ref_not_stable_or_beta_on_release_channel.json
index 6b54a31..9f0d241 100644
--- a/recipes/release/release_builder.expected/filter_git_ref_not_stable_or_beta_on_release_channel.json
+++ b/recipes/release/release_builder.expected/filter_git_ref_not_stable_or_beta_on_release_channel.json
@@ -274,6 +274,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -290,7 +294,18 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@abc123@@@"
+ ]
},
{
"cmd": [
@@ -515,6 +530,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -531,9 +553,16 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
diff --git a/recipes/release/release_builder.expected/filter_targets_not_on_current_platform.json b/recipes/release/release_builder.expected/filter_targets_not_on_current_platform.json
index 8a24968..db82d67 100644
--- a/recipes/release/release_builder.expected/filter_targets_not_on_current_platform.json
+++ b/recipes/release/release_builder.expected/filter_targets_not_on_current_platform.json
@@ -274,6 +274,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -290,7 +294,18 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@abc123@@@"
+ ]
},
{
"cmd": [
@@ -515,6 +530,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -531,9 +553,16 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
diff --git a/recipes/release/release_builder.expected/linux_engine_monorepo_candidate.json b/recipes/release/release_builder.expected/linux_engine_monorepo_candidate.json
index 7ed83ff..b6023ea 100644
--- a/recipes/release/release_builder.expected/linux_engine_monorepo_candidate.json
+++ b/recipes/release/release_builder.expected/linux_engine_monorepo_candidate.json
@@ -274,6 +274,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -290,7 +294,18 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@abc123@@@"
+ ]
},
{
"cmd": [
@@ -515,6 +530,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -531,9 +553,16 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
diff --git a/recipes/release/release_builder.expected/linux_schedule_during_release_override.json b/recipes/release/release_builder.expected/linux_schedule_during_release_override.json
index 6d8be9b..cfc0ddf 100644
--- a/recipes/release/release_builder.expected/linux_schedule_during_release_override.json
+++ b/recipes/release/release_builder.expected/linux_schedule_during_release_override.json
@@ -274,6 +274,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -290,7 +294,18 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@abc123@@@"
+ ]
},
{
"cmd": [
@@ -515,6 +530,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -531,9 +553,16 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
diff --git a/recipes/release/release_builder.expected/linux_scheduler_release.json b/recipes/release/release_builder.expected/linux_scheduler_release.json
index 1b68045..4a571f8 100644
--- a/recipes/release/release_builder.expected/linux_scheduler_release.json
+++ b/recipes/release/release_builder.expected/linux_scheduler_release.json
@@ -274,6 +274,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -290,7 +294,18 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@abc123@@@"
+ ]
},
{
"cmd": [
@@ -515,6 +530,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -531,9 +553,16 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
diff --git a/recipes/release/release_builder.expected/retry_override_skips_config_name_not_matched.json b/recipes/release/release_builder.expected/retry_override_skips_config_name_not_matched.json
index 590361f..743a363 100644
--- a/recipes/release/release_builder.expected/retry_override_skips_config_name_not_matched.json
+++ b/recipes/release/release_builder.expected/retry_override_skips_config_name_not_matched.json
@@ -274,6 +274,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -290,7 +294,18 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@abc123@@@"
+ ]
},
{
"cmd": [
@@ -515,6 +530,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -531,9 +553,16 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
diff --git a/recipes/release/release_builder.expected/retry_override_still_runs_non_config_name_target.json b/recipes/release/release_builder.expected/retry_override_still_runs_non_config_name_target.json
index d858ff9..ebe68fa 100644
--- a/recipes/release/release_builder.expected/retry_override_still_runs_non_config_name_target.json
+++ b/recipes/release/release_builder.expected/retry_override_still_runs_non_config_name_target.json
@@ -274,6 +274,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -290,7 +294,18 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@abc123@@@"
+ ]
},
{
"cmd": [
@@ -515,6 +530,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -531,9 +553,16 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
diff --git a/recipes/release/release_builder.expected/skip_engine_content_hash_not_changed.json b/recipes/release/release_builder.expected/skip_engine_content_hash_not_changed.json
index 8c37501..6cf045d 100644
--- a/recipes/release/release_builder.expected/skip_engine_content_hash_not_changed.json
+++ b/recipes/release/release_builder.expected/skip_engine_content_hash_not_changed.json
@@ -274,6 +274,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -290,7 +294,18 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@abc123@@@"
+ ]
},
{
"cmd": [
@@ -516,6 +531,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"bin/internal/content_aware_hash.sh"
],
@@ -532,9 +554,17 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_TEXT@abc123@@@"
]
},
{
diff --git a/recipes/release/release_builder.expected/windows_scheduler_release.json b/recipes/release/release_builder.expected/windows_scheduler_release.json
index 08872a3..f5be01b 100644
--- a/recipes/release/release_builder.expected/windows_scheduler_release.json
+++ b/recipes/release/release_builder.expected/windows_scheduler_release.json
@@ -250,6 +250,10 @@
]
},
{
+ "cmd": [],
+ "name": "Compute content hash"
+ },
+ {
"cmd": [
"powershell.exe",
"bin\\internal\\content_aware_hash.ps1"
@@ -267,7 +271,17 @@
"hostname": "rdbhost"
}
},
- "name": "Compute content hash"
+ "name": "Compute content hash.Execute content_aware_hash script",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -492,6 +506,13 @@
]
},
{
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [
"powershell.exe",
"bin\\internal\\content_aware_hash.ps1"
@@ -509,9 +530,16 @@
"hostname": "rdbhost"
}
},
- "name": "Compute previous commit content hash.Compute content hash",
+ "name": "Compute previous commit content hash.Compute content hash.Execute content_aware_hash script",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@2@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Compute previous commit content hash.Compute content hash.Get content hash",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@"
]
},
{
diff --git a/recipes/release/release_builder.py b/recipes/release/release_builder.py
index 755c242..a2afac1 100644
--- a/recipes/release/release_builder.py
+++ b/recipes/release/release_builder.py
@@ -194,12 +194,15 @@
'powershell.exe',
api.path.join('bin', 'internal', 'content_aware_hash.ps1')
]
- with api.context(cwd=checkout_path):
- return api.step(
- 'Compute content hash',
- cmd_content_hash,
- stdout=api.raw_io.output_text(),
- ).stdout.strip()
+ with api.step.nest('Compute content hash'):
+ with api.context(cwd=checkout_path):
+ content_hash = api.step(
+ 'Execute content_aware_hash script',
+ cmd_content_hash,
+ stdout=api.raw_io.output_text(),
+ ).stdout.strip()
+ api.step.empty('Get content hash', step_text = content_hash)
+ return content_hash
def ScheduleBuildsForRepo(
@@ -423,7 +426,7 @@
'framework.read ci yaml.parse', api.json.output({"targets": []})
),
api.step_data(
- 'Compute content hash', stdout=api.raw_io.output_text('abc123')
+ 'Compute content hash.Execute content_aware_hash script', stdout=api.raw_io.output_text('abc123')
),
)
@@ -521,7 +524,7 @@
)
),
api.step_data(
- 'Compute content hash', stdout=api.raw_io.output_text('abc123')
+ 'Compute content hash.Execute content_aware_hash script', stdout=api.raw_io.output_text('abc123')
)
)
yield api.test(
@@ -593,7 +596,7 @@
collect_step="engine.collect builds",
),
api.step_data(
- 'Compute content hash', stdout=api.raw_io.output_text('abc123')
+ 'Compute content hash.Execute content_aware_hash script', stdout=api.raw_io.output_text('abc123')
)
)
yield api.test(
@@ -665,7 +668,7 @@
collect_step="engine.collect builds",
),
api.step_data(
- 'Compute content hash', stdout=api.raw_io.output_text('abc123')
+ 'Compute content hash.Execute content_aware_hash script', stdout=api.raw_io.output_text('abc123')
)
)
yield api.test(
@@ -723,7 +726,7 @@
)
),
api.step_data(
- 'Compute content hash', stdout=api.raw_io.output_text('abc123')
+ 'Compute content hash.Execute content_aware_hash script', stdout=api.raw_io.output_text('abc123')
)
)
yield api.test(
@@ -773,7 +776,7 @@
collect_step="framework.collect builds",
),
api.step_data(
- 'Compute content hash', stdout=api.raw_io.output_text('abc123')
+ 'Compute content hash.Execute content_aware_hash script', stdout=api.raw_io.output_text('abc123')
)
)
yield api.test(
@@ -828,7 +831,7 @@
)
),
api.step_data(
- 'Compute content hash', stdout=api.raw_io.output_text('abc123')
+ 'Compute content hash.Execute content_aware_hash script', stdout=api.raw_io.output_text('abc123')
)
)
yield api.test(
@@ -879,7 +882,7 @@
stdout=api.raw_io.output_text('remotes/origin/beta')
),
api.step_data(
- 'Compute content hash', stdout=api.raw_io.output_text('abc123')
+ 'Compute content hash.Execute content_aware_hash script', stdout=api.raw_io.output_text('abc123')
)
)
yield api.test(
@@ -926,7 +929,7 @@
collect_step="framework.collect builds",
),
api.step_data(
- 'Compute content hash', stdout=api.raw_io.output_text('abc123')
+ 'Compute content hash.Execute content_aware_hash script', stdout=api.raw_io.output_text('abc123')
)
)
yield api.test(
@@ -973,7 +976,7 @@
collect_step="framework.collect builds",
),
api.step_data(
- 'Compute content hash', stdout=api.raw_io.output_text('abc123')
+ 'Compute content hash.Execute content_aware_hash script', stdout=api.raw_io.output_text('abc123')
)
)
yield api.test(
@@ -1005,14 +1008,14 @@
)
),
api.step_data(
- 'Compute content hash', stdout=api.raw_io.output_text('abc123')
+ 'Compute content hash.Execute content_aware_hash script', stdout=api.raw_io.output_text('abc123')
),
api.step_data(
'git rev-parse',
stdout=api.raw_io.output_text('def456')
),
api.step_data(
- 'Compute previous commit content hash.Compute content hash',
+ 'Compute previous commit content hash.Compute content hash.Execute content_aware_hash script',
stdout=api.raw_io.output_text('abc123')
),
)
@@ -1089,6 +1092,6 @@
)
),
api.step_data(
- 'Compute content hash', stdout=api.raw_io.output_text('abc123')
+ 'Compute content hash.Execute content_aware_hash script', stdout=api.raw_io.output_text('abc123')
)
)
