Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-01-18 23:01:44 +01:00
Code Issues Activity

Merge 065af3a4123751e1831bd673d8c4eb83e199981f into fafd1db19e3aae98a92fb3a5673f34e389a26e4b

Browse Source
This commit is contained in:
Shravani Totre 2026-01-17 11:22:42 -08:00 committed by GitHub
commit aa8ae2eafe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/setting/actions.go
View File

@ -7,8 +7,6 @@ import (
"fmt"
"strings"
"time"
"code.gitea.io/gitea/modules/log"
)
// Actions settings
@ -41,8 +39,7 @@ func (url defaultActionsURL) URL() string {
case defaultActionsURLSelf:
return strings.TrimSuffix(AppURL, "/")
default:
// This should never happen, but just in case, use GitHub as fallback
return "https://github.com"
return strings.Split(string(url), ",")[0]
}
}
@ -79,11 +76,9 @@ func loadActionsFrom(rootCfg ConfigProvider) error {
if urls := string(Actions.DefaultActionsURL); urls != defaultActionsURLGitHub && urls != defaultActionsURLSelf {
url := strings.Split(urls, ",")[0]
if strings.HasPrefix(url, "https://") || strings.HasPrefix(url, "http://") {
log.Error("[actions] DEFAULT_ACTIONS_URL does not support %q as custom URL any longer, fallback to %q",
urls,
defaultActionsURLGitHub,
)
Actions.DefaultActionsURL = defaultActionsURLGitHub
// Users may want to define their own default actions URL, e.g. "https://github.com" or a self-hosted mirror.
// So we should not force the fallback to "github" (defaultActionsURLGitHub) here.
// The user should ensure the URL is valid and accessible.
} else {
return fmt.Errorf("unsupported [actions] DEFAULT_ACTIONS_URL: %q", urls)
}

6
modules/setting/actions_test.go
View File

@ -146,7 +146,7 @@ DEFAULT_ACTIONS_URL = self
DEFAULT_ACTIONS_URL = https://gitea.com
`,
wantErr: assert.NoError,
wantURL: "https://github.com",
wantURL: "https://gitea.com",
},
{
name: "custom urls",
@ -155,7 +155,7 @@ DEFAULT_ACTIONS_URL = https://gitea.com
DEFAULT_ACTIONS_URL = https://gitea.com,https://github.com
`,
wantErr: assert.NoError,
wantURL: "https://github.com",
wantURL: "https://gitea.com",
},
{
name: "invalid",
@ -164,7 +164,7 @@ DEFAULT_ACTIONS_URL = https://gitea.com,https://github.com
DEFAULT_ACTIONS_URL = gitea
`,
wantErr: assert.Error,
wantURL: "https://github.com",
wantURL: "gitea",
},
}