Merge branch 'master' into feat/312

.github/workflows/bot.yml

@@ -55,13 +55,15 @@ jobs:
         working-directory: contribs/github-bot
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: echo "pr-numbers=$(go run . matrix)" >> "$GITHUB_OUTPUT"
+        run: go run . matrix -matrix-key 'pr-numbers' -verbose
 
   # This job processes each pull request in the matrix individually while ensuring
   # that a same PR cannot be processed concurrently by mutliple runners
   process-pr:
     name: Process PR
     needs: define-prs-matrix
+    # Just skip this job if PR numbers matrix is empty (prevent failed state)
+    if: ${{ needs.define-prs-matrix.outputs.pr-numbers != '[]' && needs.define-prs-matrix.outputs.pr-numbers != '' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:

.github/workflows/gnovm.yml

@@ -13,8 +13,6 @@ jobs:
     uses: ./.github/workflows/main_template.yml
     with:
       modulepath: "gnovm"
-      # in pull requests, append -short so that the CI runs quickly.
-      tests-extra-args: ${{ github.event_name == 'pull_request' && '-short' || '' }}
     secrets:
       codecov-token: ${{ secrets.CODECOV_TOKEN }}
   fmt:

.github/workflows/test_template.yml

@@ -41,11 +41,14 @@ jobs:
             # Craft a filter flag based on the module path to avoid expanding coverage on unrelated tags.
             export filter="-pkg=github.com/gnolang/gno/${{ inputs.modulepath }}/..."
 
+            # codecov only supports "boolean" coverage (whether a line is
+            # covered or not); so using -covermode=count or atomic would be
+            # pointless here.
             # XXX: Simplify coverage of txtar - the current setup is a bit
             # confusing and meticulous. There will be some improvements in Go
             # 1.23 regarding coverage, so we can use this as a workaround until
             # then.
-            go test -covermode=atomic -timeout ${{ inputs.tests-timeout }} ${{ inputs.tests-extra-args }} ./... -test.gocoverdir=$GOCOVERDIR
+            go test -covermode=set -timeout ${{ inputs.tests-timeout }} ${{ inputs.tests-extra-args }} ./... -test.gocoverdir=$GOCOVERDIR
 
             # Print results
             (set +x; echo 'go coverage results:')

Makefile

@@ -54,7 +54,7 @@ install_gnokey: install.gnokey
 install_gno: install.gno
 
 .PHONY: test
-test: test.components test.docker
+test: test.components
 
 .PHONY: test.components
 test.components:
@@ -64,14 +64,6 @@ test.components:
 	$(MAKE) --no-print-directory -C examples test
 	$(MAKE) --no-print-directory -C misc     test
 
-.PHONY: test.docker
-test.docker:
-	@if hash docker 2>/dev/null; then \
-		go test --tags=docker -count=1 -v ./misc/docker-integration; \
-	else \
-		echo "[-] 'docker' is missing, skipping ./misc/docker-integration tests."; \
-	fi
-
 .PHONY: fmt
 fmt:
 	$(MAKE) --no-print-directory -C tm2      fmt imports

contribs/github-bot/README.md

@@ -13,7 +13,7 @@ The bot operates by defining a set of rules that are evaluated against each pull
 - **Automatic Checks**: These are rules that the bot evaluates automatically. If a pull request meets the conditions specified in the rule, then the corresponding requirements are executed. For example, ensuring that changes to specific directories are reviewed by specific team members.
 - **Manual Checks**: These require human intervention. If a pull request meets the conditions specified in the rule, then a checkbox that can be checked only by specified teams is displayed on the bot comment. For example, determining if infrastructure needs to be updated based on changes to specific files.
 
-The bot configuration is defined in Go and is located in the file [config.go](./config.go).
+The bot configuration is defined in Go and is located in the file [config.go](./internal/config/config.go).
 
 ### GitHub Token
 
@@ -31,7 +31,7 @@ For the bot to make requests to the GitHub API, it needs a Personal Access Token
 USAGE
   github-bot check [flags]
 
-This tool checks if the requirements for a pull request to be merged are satisfied (defined in config.go) and displays PR status checks accordingly.
+This tool checks if the requirements for a pull request to be merged are satisfied (defined in ./internal/config/config.go) and displays PR status checks accordingly.
 A valid GitHub Token must be provided by setting the GITHUB_TOKEN environment variable.
 
 FLAGS

contribs/github-bot/check.go → contribs/github-bot/internal/check/check.go

@@ -1,4 +1,4 @@
-package main
+package check
 
 import (
 	"context"
@@ -9,44 +9,30 @@ import (
 	"sync/atomic"
 
 	"github.com/gnolang/gno/contribs/github-bot/internal/client"
+	"github.com/gnolang/gno/contribs/github-bot/internal/config"
 	"github.com/gnolang/gno/contribs/github-bot/internal/logger"
-	p "github.com/gnolang/gno/contribs/github-bot/internal/params"
 	"github.com/gnolang/gno/contribs/github-bot/internal/utils"
-	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/google/go-github/v64/github"
 	"github.com/sethvargo/go-githubactions"
 	"github.com/xlab/treeprint"
 )
 
-func newCheckCmd() *commands.Command {
-	params := &p.Params{}
-
-	return commands.NewCommand(
-		commands.Metadata{
-			Name:       "check",
-			ShortUsage: "github-bot check [flags]",
-			ShortHelp:  "checks requirements for a pull request to be merged",
-			LongHelp:   "This tool checks if the requirements for a pull request to be merged are satisfied (defined in config.go) and displays PR status checks accordingly.\nA valid GitHub Token must be provided by setting the GITHUB_TOKEN environment variable.",
-		},
-		params,
-		func(_ context.Context, _ []string) error {
-			params.ValidateFlags()
-			return execCheck(params)
-		},
-	)
-}
-
-func execCheck(params *p.Params) error {
+func execCheck(flags *checkFlags) error {
 	// Create context with timeout if specified in the parameters.
 	ctx := context.Background()
-	if params.Timeout > 0 {
+	if flags.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(context.Background(), params.Timeout)
+		ctx, cancel = context.WithTimeout(context.Background(), flags.Timeout)
 		defer cancel()
 	}
 
 	// Init GitHub API client.
-	gh, err := client.New(ctx, params)
+	gh, err := client.New(ctx, &client.Config{
+		Owner:   flags.Owner,
+		Repo:    flags.Repo,
+		Verbose: *flags.Verbose,
+		DryRun:  flags.DryRun,
+	})
 	if err != nil {
 		return fmt.Errorf("comment update handling failed: %w", err)
 	}
@@ -69,19 +55,19 @@ func execCheck(params *p.Params) error {
 	var prs []*github.PullRequest
 
 	// If requested, retrieve all open pull requests.
-	if params.PRAll {
+	if flags.PRAll {
 		prs, err = gh.ListPR(utils.PRStateOpen)
 		if err != nil {
 			return fmt.Errorf("unable to list all PR: %w", err)
 		}
 	} else {
 		// Otherwise, retrieve only specified pull request(s)
 		// (flag or GitHub Action context).
-		prs = make([]*github.PullRequest, len(params.PRNums))
-		for i, prNum := range params.PRNums {
-			pr, _, err := gh.Client.PullRequests.Get(gh.Ctx, gh.Owner, gh.Repo, prNum)
+		prs = make([]*github.PullRequest, len(flags.PRNums))
+		for i, prNum := range flags.PRNums {
+			pr, err := gh.GetOpenedPullRequest(prNum)
 			if err != nil {
-				return fmt.Errorf("unable to retrieve specified pull request (%d): %w", prNum, err)
+				return fmt.Errorf("unable to process PR list: %w", err)
 			}
 			prs[i] = pr
 		}
@@ -101,7 +87,7 @@ func processPRList(gh *client.GitHub, prs []*github.PullRequest) error {
 	}
 
 	// Process all pull requests in parallel.
-	autoRules, manualRules := config(gh)
+	autoRules, manualRules := config.Config(gh)
 	var wg sync.WaitGroup
 
 	// Used in dry-run mode to log cleanly from different goroutines.
@@ -122,15 +108,15 @@ func processPRList(gh *client.GitHub, prs []*github.PullRequest) error {
 				ifDetails := treeprint.NewWithRoot(fmt.Sprintf("%s Condition met", utils.Success))
 
 				// Check if conditions of this rule are met by this PR.
-				if !autoRule.ifC.IsMet(pr, ifDetails) {
+				if !autoRule.If.IsMet(pr, ifDetails) {
 					continue
 				}
 
-				c := AutoContent{Description: autoRule.description, Satisfied: false}
+				c := AutoContent{Description: autoRule.Description, Satisfied: false}
 				thenDetails := treeprint.NewWithRoot(fmt.Sprintf("%s Requirement not satisfied", utils.Fail))
 
 				// Check if requirements of this rule are satisfied by this PR.
-				if autoRule.thenR.IsSatisfied(pr, thenDetails) {
+				if autoRule.Then.IsSatisfied(pr, thenDetails) {
 					thenDetails.SetValue(fmt.Sprintf("%s Requirement satisfied", utils.Success))
 					c.Satisfied = true
 				} else {
@@ -153,24 +139,24 @@ func processPRList(gh *client.GitHub, prs []*github.PullRequest) error {
 				ifDetails := treeprint.NewWithRoot(fmt.Sprintf("%s Condition met", utils.Success))
 
 				// Check if conditions of this rule are met by this PR.
-				if !manualRule.ifC.IsMet(pr, ifDetails) {
+				if !manualRule.If.IsMet(pr, ifDetails) {
 					continue
 				}
 
 				// Get check status from current comment, if any.
 				checkedBy := ""
-				check, ok := checks[manualRule.description]
+				check, ok := checks[manualRule.Description]
 				if ok {
 					checkedBy = check.checkedBy
 				}
 
 				commentContent.ManualRules = append(
 					commentContent.ManualRules,
 					ManualContent{
-						Description:      manualRule.description,
+						Description:      manualRule.Description,
 						ConditionDetails: ifDetails.String(),
 						CheckedBy:        checkedBy,
-						Teams:            manualRule.teams,
+						Teams:            manualRule.Teams,
 					},
 				)