adamm/autogits
SHA256
1
0
Fork 0
Code Issues 8 Projects 2 Activity

pr: add reviewers to PR workflow

Browse Source
This commit is contained in:
Adam Majer 2024-09-30 16:19:40 +02:00
parent 3d7336a3a0
commit a0a79dcf4d
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bots-common/config.go
View File

@ -22,6 +22,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"log"
"os" "os"
"slices" "slices"
"strings" "strings"
@ -32,6 +33,7 @@ type AutogitConfig struct {
Organization string Organization string
GitProjectName string // Organization/GitProjectName.git is PrjGit GitProjectName string // Organization/GitProjectName.git is PrjGit
Branch string // branch name of PkgGit that aligns with PrjGit submodules Branch string // branch name of PkgGit that aligns with PrjGit submodules
Reviewers []string // only used by `pr` workflow
} }
func ReadWorkflowConfigs(reader io.Reader) ([]*AutogitConfig, error) { func ReadWorkflowConfigs(reader io.Reader) ([]*AutogitConfig, error) {
@ -47,7 +49,11 @@ func ReadWorkflowConfigs(reader io.Reader) ([]*AutogitConfig, error) {
availableWorkflows := []string{"pr", "direct", "test"} availableWorkflows := []string{"pr", "direct", "test"}
for _, workflow := range config { for _, workflow := range config {
pr := false
for _, w := range workflow.Workflows { for _, w := range workflow.Workflows {
if w == "pr" {
pr = true
}
if !slices.Contains(availableWorkflows, w) { if !slices.Contains(availableWorkflows, w) {
return nil, fmt.Errorf( return nil, fmt.Errorf(
"Invalid Workflow '%s'. Only available workflows are: %s", "Invalid Workflow '%s'. Only available workflows are: %s",
@ -58,6 +64,12 @@ func ReadWorkflowConfigs(reader io.Reader) ([]*AutogitConfig, error) {
if len(workflow.GitProjectName) == 0 { if len(workflow.GitProjectName) == 0 {
workflow.GitProjectName = DefaultGitPrj workflow.GitProjectName = DefaultGitPrj
} }
if !pr && len(workflow.Reviewers) > 0 {
log.Println(" Warning: non-PR-only workflows contains Reviewers. These are ignored in Org:", workflow.Organization)
}
if pr && !slices.Contains(workflow.Reviewers, Bot_BuildReview) {
workflow.Reviewers = append(workflow.Reviewers, Bot_BuildReview)
}
} }
return config, nil return config, nil

6
workflow-pr/README.md
View File

@ -27,6 +27,9 @@ JSON
* _Organization_: organization that holds all the packages * _Organization_: organization that holds all the packages
* _Branch_: branch updated in repo's * _Branch_: branch updated in repo's
* _GitProjectName_: package in above org, or `org/package` for PrjGit * _GitProjectName_: package in above org, or `org/package` for PrjGit
* _Reviewers_: accounts associated with mandatory reviews for PrjGit. Can trigger additional
review requests for PrjGit or associated PkgGit repos. Only when all reviews are
satisfied, will the PrjGit PR be merged.
example: example:
@ -35,7 +38,8 @@ example:
"Workflows": ["pr", "direct"], "Workflows": ["pr", "direct"],
"Organization": "autogits", "Organization": "autogits",
"GitProjectName": "HiddenPrj", "GitProjectName": "HiddenPrj",
"Branch": "hidden" "Branch": "hidden",
"Reviewers": []
}, },
... ...
] ]

9
workflow-pr/main.go
View File

@ -180,7 +180,12 @@ referencing the following pull request:
} }
// request build review // request build review
_, err = gitea.RequestReviews(PR, common.Bot_BuildReview) for _, reviewer := range config.Reviewers {
_, err := gitea.RequestReviews(PR, reviewer)
if err != nil {
return fmt.Errorf("Failed to create reviewer '%s' for request: %s/%s/%d Err: %w", reviewer, PR.Base.Repo.Owner.UserName, PR.Base.Repo.Name, PR.Index, err)
}
}
return err return err
} }
@ -261,7 +266,7 @@ nextSubmodule:
} }
if DebugMode { if DebugMode {
log.Println(" - # of PRs to check:" , len(prs)) log.Println(" - # of PRs to check:", len(prs))
} }
for _, pr := range prs { for _, pr := range prs {