From 8b2f1677fe55fe87d0b9d4d53fc1d1025a71d8e1 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 5 Apr 2023 14:01:23 +0200 Subject: [PATCH] default GITHUB_SERVER_URL with registration address If unset it will default to whatever is in the GITHUB_SERVER_URL environment variable which is not desirable when in the context of integration tests that run a forgejo instance in the CI of another forgejo instance. --- cmd/daemon.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmd/daemon.go b/cmd/daemon.go index 188491d..e8352b9 100644 --- a/cmd/daemon.go +++ b/cmd/daemon.go @@ -65,6 +65,14 @@ func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command, version, ) + if cfg.Runner.Envs == nil { + cfg.Runner.Envs = make(map[string]string, 10) + } + + if _, ok := cfg.Runner.Envs["GITHUB_SERVER_URL"]; !ok { + cfg.Runner.Envs["GITHUB_SERVER_URL"] = reg.Address + } + runner := &runtime.Runner{ Client: cli, Machine: reg.Name,