merith-tk/runner
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

Rename to actions (#7)

Browse source 
Co-authored-by: Jason Song <i@wolfogre.com>
Reviewed-on: https://gitea.com/gitea/act_runner/pulls/7
This commit is contained in:
Jason Song 2022-12-06 16:37:38 +08:00
parent 0cbdbd36b6
commit 6d2200b3d6
10 changed files with 41 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
runtime/reporter.go
View file

@ -7,10 +7,10 @@ import (
"sync"
"time"
runnerv1 "code.gitea.io/bots-proto-go/runner/v1"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
"gitea.com/gitea/act_runner/client"
"github.com/avast/retry-go/v4"
retry "github.com/avast/retry-go/v4"
"github.com/bufbuild/connect-go"
log "github.com/sirupsen/logrus"
"google.golang.org/protobuf/proto"

2
runtime/runtime.go
View file

@ -4,7 +4,7 @@ import (
"context"
"strings"
runnerv1 "code.gitea.io/bots-proto-go/runner/v1"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
"gitea.com/gitea/act_runner/client"
)

8
runtime/task.go
View file

@ -10,7 +10,7 @@ import (
"sync"
"time"
runnerv1 "code.gitea.io/bots-proto-go/runner/v1"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
"gitea.com/gitea/act_runner/client"
"github.com/nektos/act/pkg/artifacts"
@ -165,7 +165,7 @@ func (t *Task) Run(ctx context.Context, task *runnerv1.Task) error {
dataContext := task.Context.Fields
log.Infof("task %v repo is %v %v %v", task.Id, dataContext["repository"].GetStringValue(),
dataContext["gitea_default_bots_url"].GetStringValue(),
dataContext["gitea_default_actions_url"].GetStringValue(),
t.client.Address())
preset := &model.GithubContext{
@ -222,10 +222,10 @@ func (t *Task) Run(ctx context.Context, task *runnerv1.Task) error {
NoSkipCheckout: true,
PresetGitHubContext: preset,
EventJSON: string(eventJSON),
ContainerNamePrefix: fmt.Sprintf("GITEA-BOTS-TASK-%d", task.Id),
ContainerNamePrefix: fmt.Sprintf("GITEA-ACTIONS-TASK-%d", task.Id),
ContainerMaxLifetime: maxLifetime,
ContainerNetworkMode: input.containerNetworkMode,
DefaultActionInstance: dataContext["gitea_default_bots_url"].GetStringValue(),
DefaultActionInstance: dataContext["gitea_default_actions_url"].GetStringValue(),
PlatformPicker: t.platformPicker,
}
r, err := runner.New(config)