Skip to content

Commit cbf4fa5

Browse files
committed
provide links to runs in queue instead of commits in queue
1 parent 43ccc09 commit cbf4fa5

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

server/neptune/workflows/activities/github/revision_url_markdown.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,8 @@ func BuildRevisionURLMarkdown(repoFullName string, revision string) string {
66
// uses Markdown formatting to generate the link on GH
77
return fmt.Sprintf("[%s](https://github.com/%s/commit/%s)", revision, repoFullName, revision)
88
}
9+
10+
func BuildRunURLMarkdown(repoFullName string, revision string, runId int64) string {
11+
// uses Markdown formatting to generate the link on GH
12+
return fmt.Sprintf("[%s](https://github.com/%s/runs/%d)", revision, repoFullName, runId)
13+
}

server/neptune/workflows/internal/deploy/revision/queue/queue.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ func (q *Deploy) Push(msg terraform.DeploymentInfo) {
9090
func (q *Deploy) GetQueuedRevisionsSummary() string {
9191
var revisions []string
9292
if q.IsEmpty() {
93-
return "No other revisions ahead In queue."
93+
return "No other runs ahead in queue."
9494
}
9595
for _, deploy := range q.Scan() {
96-
revisionLink := github.BuildRevisionURLMarkdown(deploy.Repo.GetFullName(), deploy.Commit.Revision)
97-
revisions = append(revisions, revisionLink)
96+
runLink := github.BuildRunURLMarkdown(deploy.Repo.GetFullName(), deploy.Commit.Revision, deploy.CheckRunID)
97+
revisions = append(revisions, runLink)
9898
}
99-
return fmt.Sprintf("Revisions in queue: %s", strings.Join(revisions, ", "))
99+
return fmt.Sprintf("Runs in queue: %s", strings.Join(revisions, ", "))
100100
}
101101

102102
// priority is a simple 2 priority queue implementation

server/neptune/workflows/internal/deploy/terraform/state.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ func (n *StateReceiver) Receive(ctx workflow.Context, c workflow.ReceiveChannel,
5656

5757
revisionsSummary := n.Queue.GetQueuedRevisionsSummary()
5858
state := github.CheckRunQueued
59-
revisionLink := github.BuildRevisionURLMarkdown(deploymentInfo.Repo.GetFullName(), deploymentInfo.Commit.Revision)
60-
summary := fmt.Sprintf("This deploy is queued pending action on revision %s.\n%s", revisionLink, revisionsSummary)
59+
runLink := github.BuildRunURLMarkdown(deploymentInfo.Repo.GetFullName(), deploymentInfo.Commit.Revision, deploymentInfo.CheckRunID)
60+
summary := fmt.Sprintf("This deploy is queued pending action on run for revision %s.\n%s", runLink, revisionsSummary)
6161

6262
for _, i := range infos {
6363
request := notifier.GithubCheckRunRequest{

0 commit comments

Comments
 (0)