From 4f06b233a19b6ea73a2c8883063d73e4d6274944 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Wed, 28 May 2025 18:58:51 +0200 Subject: [PATCH] add missing merge cruft --- services/convert/convert.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/convert/convert.go b/services/convert/convert.go index e6a1b12cf9..d08cbb83e8 100644 --- a/services/convert/convert.go +++ b/services/convert/convert.go @@ -465,13 +465,11 @@ func ListActionWorkflows(ctx context.Context, gitrepo *git.Repository, repo *rep return nil, err } - entries, err := actions.ListWorkflows(defaultBranchCommit) + folder, entries, err := actions.ListWorkflows(defaultBranchCommit) if err != nil { return nil, err } - folder := getActionWorkflowPath(defaultBranchCommit) - workflows := make([]*api.ActionWorkflow, len(entries)) for i, entry := range entries { workflows[i] = getActionWorkflowEntry(ctx, repo, defaultBranchCommit, folder, entry)