Skip to content

Commit 4b58569

Browse files
committed
fix: update GHA notice to new format
Change-Id: I25371159566cc2de1cefd621d5f264336bb781a6
1 parent 2ff3496 commit 4b58569

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

mergify_cli/ci/upload.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ def _upload(
5757

5858
def connect_traces(spans: list[ReadableSpan]) -> None:
5959
if detector.get_ci_provider() == "github_actions" and spans:
60-
trace_id = spans[0].context.trace_id
60+
root_span_id = spans[0].context.span_id
6161
console.print(
62-
f"::notice title=Mergify CI::MERGIFY_TRACE_ID={trace_id}",
62+
f"::notice title=Mergify CI::MERGIFY_TEST_ROOT_SPAN_ID={root_span_id}",
6363
soft_wrap=True,
6464
)
6565

mergify_cli/tests/ci/test_upload.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,12 @@ async def test_junit_upload(
6161

6262
captured = capsys.readouterr()
6363
if env["GITHUB_ACTIONS"] == "true":
64-
assert re.search(
65-
r"^::notice title=Mergify CI::MERGIFY_TRACE_ID=\d+",
64+
matched = re.search(
65+
r"^::notice title=Mergify CI::MERGIFY_TEST_ROOT_SPAN_ID=(\d+)",
6666
captured.out,
6767
re.MULTILINE,
6868
)
69+
assert int(matched.group(1)) > 0
6970
else:
7071
assert "🎉 File(s) uploaded" in captured.out
7172

0 commit comments

Comments
 (0)