From 1f23da379ef4ca103138c066baafcd65260b4005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ratko=20Ru=C5=BEi=C4=8Di=C4=87?= Date: Tue, 13 May 2025 17:29:00 +0200 Subject: [PATCH] fix(bitbucketdc): build status not reported on PR builds (#5162) Co-authored-by: Ratko Ruzicic --- server/forge/bitbucketdatacenter/convert.go | 2 +- server/forge/bitbucketdatacenter/convert_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/forge/bitbucketdatacenter/convert.go b/server/forge/bitbucketdatacenter/convert.go index d1fa741d4..14890ec2b 100644 --- a/server/forge/bitbucketdatacenter/convert.go +++ b/server/forge/bitbucketdatacenter/convert.go @@ -119,7 +119,7 @@ func convertPullRequestEvent(ev *bb.PullRequestEvent, baseURL string) *model.Pip Author: authorLabel(ev.Actor.Name), Email: ev.Actor.Email, Timestamp: time.Time(ev.Date).UTC().Unix(), - Ref: fmt.Sprintf("refs/pull-requests/%d/from", ev.PullRequest.ID), + Ref: ev.PullRequest.Source.ID, ForgeURL: fmt.Sprintf("%s/projects/%s/repos/%s/commits/%s", baseURL, ev.PullRequest.Source.Repository.Project.Key, ev.PullRequest.Source.Repository.Slug, ev.PullRequest.Source.Latest), Refspec: fmt.Sprintf("%s:%s", ev.PullRequest.Source.DisplayID, ev.PullRequest.Target.DisplayID), FromFork: ev.PullRequest.Source.Repository.ID != ev.PullRequest.Target.Repository.ID, diff --git a/server/forge/bitbucketdatacenter/convert_test.go b/server/forge/bitbucketdatacenter/convert_test.go index 74ee30b98..b3e3c6bbc 100644 --- a/server/forge/bitbucketdatacenter/convert_test.go +++ b/server/forge/bitbucketdatacenter/convert_test.go @@ -218,7 +218,7 @@ func Test_convertPullRequestEvent(t *testing.T) { Author: "John Doe", Email: "john.doe@mail.com", Timestamp: now.UTC().Unix(), - Ref: "refs/pull-requests/123/from", + Ref: "refs/head/branch", ForgeURL: "https://base.url/projects/PRJ/repos/REPO/commits/1234567890abcdef", Event: model.EventPull, Refspec: "branch:main", @@ -273,7 +273,7 @@ func Test_convertPullRequestCloseEvent(t *testing.T) { Author: "John Doe", Email: "john.doe@mail.com", Timestamp: now.UTC().Unix(), - Ref: "refs/pull-requests/123/from", + Ref: "refs/head/branch", ForgeURL: "https://base.url/projects/PRJ/repos/REPO/commits/1234567890abcdef", Event: model.EventPullClosed, Refspec: "branch:main",