mirror of
https://gitea.com/gitea/act_runner.git
synced 2025-12-17 03:24:53 +00:00
Compare commits
1 Commits
v0.2.12
...
c7f39de3a8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c7f39de3a8 |
@@ -37,6 +37,7 @@ func Execute(ctx context.Context) {
|
|||||||
registerCmd.Flags().BoolVar(®Args.NoInteractive, "no-interactive", false, "Disable interactive mode")
|
registerCmd.Flags().BoolVar(®Args.NoInteractive, "no-interactive", false, "Disable interactive mode")
|
||||||
registerCmd.Flags().StringVar(®Args.InstanceAddr, "instance", "", "Gitea instance address")
|
registerCmd.Flags().StringVar(®Args.InstanceAddr, "instance", "", "Gitea instance address")
|
||||||
registerCmd.Flags().StringVar(®Args.Token, "token", "", "Runner token")
|
registerCmd.Flags().StringVar(®Args.Token, "token", "", "Runner token")
|
||||||
|
registerCmd.Flags().StringVar(®Args.TokenFile, "token-file", "", "Path to a file containing the runner token")
|
||||||
registerCmd.Flags().StringVar(®Args.RunnerName, "name", "", "Runner name")
|
registerCmd.Flags().StringVar(®Args.RunnerName, "name", "", "Runner name")
|
||||||
registerCmd.Flags().StringVar(®Args.Labels, "labels", "", "Runner tags, comma separated")
|
registerCmd.Flags().StringVar(®Args.Labels, "labels", "", "Runner tags, comma separated")
|
||||||
rootCmd.AddCommand(registerCmd)
|
rootCmd.AddCommand(registerCmd)
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ type registerArgs struct {
|
|||||||
NoInteractive bool
|
NoInteractive bool
|
||||||
InstanceAddr string
|
InstanceAddr string
|
||||||
Token string
|
Token string
|
||||||
|
TokenFile string
|
||||||
RunnerName string
|
RunnerName string
|
||||||
Labels string
|
Labels string
|
||||||
}
|
}
|
||||||
@@ -250,13 +251,26 @@ func printStageHelp(stage registerStage) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func registerNoInteractive(ctx context.Context, configFile string, regArgs *registerArgs) error {
|
func registerNoInteractive(ctx context.Context, configFile string, regArgs *registerArgs) error {
|
||||||
|
var token string
|
||||||
cfg, err := config.LoadDefault(configFile)
|
cfg, err := config.LoadDefault(configFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if regArgs.Token == "" && regArgs.TokenFile == "" {
|
||||||
|
return fmt.Errorf("Missing Token argument. token or token-file should be set.")
|
||||||
|
}
|
||||||
|
if regArgs.TokenFile != "" {
|
||||||
|
token_bytes, err := os.ReadFile(regArgs.TokenFile)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("Cannot read the token file: %s", regArgs.TokenFile, err)
|
||||||
|
}
|
||||||
|
token = string(token_bytes)
|
||||||
|
} else {
|
||||||
|
token = regArgs.Token
|
||||||
|
}
|
||||||
inputs := ®isterInputs{
|
inputs := ®isterInputs{
|
||||||
InstanceAddr: regArgs.InstanceAddr,
|
InstanceAddr: regArgs.InstanceAddr,
|
||||||
Token: regArgs.Token,
|
Token: token,
|
||||||
RunnerName: regArgs.RunnerName,
|
RunnerName: regArgs.RunnerName,
|
||||||
Labels: defaultLabels,
|
Labels: defaultLabels,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user