add forgeinstance

cmd/daemon.go

@@ -20,11 +20,11 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
-func runDaemon(ctx context.Context, task *runtime.Task) func(cmd *cobra.Command, args []string) error {
+func runDaemon(ctx context.Context, envFile string) func(cmd *cobra.Command, args []string) error {
 	return func(cmd *cobra.Command, args []string) error {
 		log.Infoln("Starting runner daemon")
 
-		_ = godotenv.Load(task.Input.EnvFile)
+		_ = godotenv.Load(envFile)
 		cfg, err := config.FromEnviron()
 		if err != nil {
 			log.WithError(err).
@@ -101,9 +101,10 @@ func runDaemon(ctx context.Context, task *runtime.Task) func(cmd *cobra.Command,
 		)
 
 		runner := &runtime.Runner{
-			Client:  cli,
+			Client:        cli,
-			Machine: cfg.Runner.Name,
+			Machine:       cfg.Runner.Name,
-			Environ: cfg.Runner.Environ,
+			ForgeInstance: cfg.ForgeInstance,
+			Environ:       cfg.Runner.Environ,
 		}
 
 		poller := poller.New(

cmd/root.go

@@ -33,7 +33,7 @@ func initLogging(cfg config.Config) {
 }
 
 func Execute(ctx context.Context) {
-	task := runtime.NewTask(0, nil)
+	task := runtime.NewTask("gitea", 0, nil)
 
 	// ./act_runner
 	rootCmd := &cobra.Command{
@@ -54,7 +54,7 @@ func Execute(ctx context.Context) {
 		Aliases: []string{"daemon"},
 		Use:     "execute runner daemon",
 		Args:    cobra.MaximumNArgs(1),
-		RunE:    runDaemon(ctx, task),
+		RunE:    runDaemon(ctx, task.Input.EnvFile),
 	}
 	// add all command
 	rootCmd.AddCommand(daemonCmd)

config/config.go

@@ -16,11 +16,12 @@ import (
 type (
 	// Config provides the system configuration.
 	Config struct {
-		Debug    bool `envconfig:"GITEA_DEBUG"`
+		Debug         bool `envconfig:"GITEA_DEBUG"`
-		Trace    bool `envconfig:"GITEA_TRACE"`
+		Trace         bool `envconfig:"GITEA_TRACE"`
-		Client   Client
+		Client        Client
-		Runner   Runner
+		Runner        Runner
-		Platform Platform
+		Platform      Platform
+		ForgeInstance string
 	}
 
 	Client struct {
@@ -68,6 +69,7 @@ func FromEnviron() (Config, error) {
 		if runner.UUID != "" {
 			cfg.Runner.UUID = runner.UUID
 		}
+		cfg.ForgeInstance = runner.ForgeInstance
 	}
 
 	// runner config

core/runner.go

@@ -4,8 +4,9 @@ const UUIDHeader = "x-runner-uuid"
 
 // Runner struct
 type Runner struct {
-	ID    int64  `json:"id"`
+	ID            int64  `json:"id"`
-	UUID  string `json:"uuid"`
+	UUID          string `json:"uuid"`
-	Name  string `json:"name"`
+	Name          string `json:"name"`
-	Token string `json:"token"`
+	Token         string `json:"token"`
+	ForgeInstance string `json:"forge_instance"`
 }

register/register.go

@@ -46,6 +46,7 @@ func (p *Register) Register(ctx context.Context, cfg config.Runner) (*core.Runne
 		UUID:  resp.Msg.Runner.Uuid,
 		Name:  resp.Msg.Runner.Name,
 		Token: resp.Msg.Runner.Token,
+		// ForgeInstance: resp.Msg.Runner.ForgeInstance, TODO: add me
 	}
 
 	file, err := json.MarshalIndent(data, "", "  ")

runtime/runtime.go

@@ -12,9 +12,10 @@ import (
 
 // Runner runs the pipeline.
 type Runner struct {
-	Machine string
+	Machine       string
-	Environ map[string]string
+	ForgeInstance string
-	Client  client.Client
+	Environ       map[string]string
+	Client        client.Client
 }
 
 // Run runs the pipeline stage.
@@ -48,5 +49,5 @@ func (s *Runner) Run(ctx context.Context, task *runnerv1.Task) error {
 		l.Info("update runner status to idle")
 	}()
 
-	return NewTask(task.Id, s.Client).Run(ctx, task)
+	return NewTask(s.ForgeInstance, task.Id, s.Client).Run(ctx, task)
 }

runtime/task.go

@@ -86,11 +86,11 @@ type Task struct {
 }
 
 // NewTask creates a new task
-func NewTask(buildID int64, client client.Client) *Task {
+func NewTask(forgeInstance string, buildID int64, client client.Client) *Task {
 	task := &Task{
 		Input: &TaskInput{
 			reuseContainers: true,
-			ForgeInstance:   "gitea",
+			ForgeInstance:   forgeInstance,
 		},
 		BuildID: buildID,