Skip to content

fix: merge multi same repo in workflow #4936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PetrusZ wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: merge multi same repo in workflow #4936

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions pkg/microservice/aslan/core/workflow/service/workflow/controller/job/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,22 +226,34 @@ func applyKeyVals(base, input commonmodels.RuntimeKeyValList, useInputKVSource b
}

func applyRepos(base, input []*types.Repository) []*types.Repository {
type repoKey struct {
key string
checkoutPath string
}

resp := make([]*types.Repository, 0)
customRepoMap := make(map[string]*types.Repository)
customRepoMap := make(map[repoKey]*types.Repository)
for _, repo := range input {
if repo.RepoNamespace == "" {
repo.RepoNamespace = repo.RepoOwner
}
customRepoMap[repo.GetKey()] = repo
customRepoMap[repoKey{key: repo.GetKey()}] = repo
if repo.CheckoutPath != "" {
customRepoMap[repoKey{key: repo.GetKey(), checkoutPath: repo.CheckoutPath}] = repo
}
}
for _, repo := range base {
item := new(types.Repository)
_ = util.DeepCopy(item, repo)
if item.RepoNamespace == "" {
item.RepoNamespace = item.RepoOwner
}
cv, ok := customRepoMap[repoKey{key: repo.GetKey(), checkoutPath: repo.CheckoutPath}]
if !ok {
cv, ok = customRepoMap[repoKey{key: repo.GetKey()}]
}
// user can only set default branch in custom workflow.
if cv, ok := customRepoMap[repo.GetKey()]; ok {
if ok {
item.Branch = cv.Branch
item.MergeBranches = cv.MergeBranches
item.Tag = cv.Tag
Expand Down
Loading