mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-08 08:04:21 +00:00
[CI] DEFAULT_ACTIONS_URL = https://code.forgejo.org
[CI] Revert "Restrict `[actions].DEFAULT_ACTIONS_URL` to only `github` or `self` (#25581)" This reverts commit67bd9d4f1e. (cherry picked from commit0547e94023) (cherry picked from commitd21ad654ad) (cherry picked from commitb905e9d838) (cherry picked from commit 251a5bf235b1723bc2bc324f9e8c03a8668bb5ae) (cherry picked from commitb370e47694) (cherry picked from commit2cc28d0785) (cherry picked from commited870a39e9) (cherry picked from commit7bb0c4654e) (cherry picked from commitbab1f552c3) Conflicts: custom/conf/app.example.ini modules/setting/actions.go https://codeberg.org/forgejo/forgejo/pulls/1413 [CI] DEFAULT_ACTIONS_URL = https://codeberg.org (cherry picked from commit52b364ddbd) (cherry picked from commit99887cd567) (cherry picked from commitcd5788782a) (cherry picked from commit71c698a704) (cherry picked from commit71386241dd) (cherry picked from commitb7ab05aeac) (cherry picked from commite78b9ca59c) (cherry picked from commitedb3adf460) (cherry picked from commit3e40088197) [BRANDING] DEFAULT_ACTIONS_URL = https://code.forgejo.org (cherry picked from commitd0e4512c90) (cherry picked from commit8ba6e04709) (cherry picked from commit6349081044) (cherry picked from commite06bd44495) (cherry picked from commitd58219d8e1) (cherry picked from commit052f2c2aa4) (cherry picked from commit29dc395386) (cherry picked from commit9eef3f59f3) (cherry picked from commitd650391fed) (cherry picked from commitc2e6e8c55d) (cherry picked from commite28a47741d) [CI] DEFAULT_ACTIONS_URL support for self & github (squash) Refs: https://codeberg.org/forgejo/forgejo/issues/1062 (cherry picked from commit74cc25376e) (cherry picked from commit405430708f) (cherry picked from commit 0274a6dee7f383bcd6b65b995b991b5ab0ee635a) (cherry picked from commitbe5cda0fd0) (cherry picked from commitd27474849f) (cherry picked from commit4a5e9e2d81) (cherry picked from commit65b31906b2) (cherry picked from commit13cf0b0963) Conflicts: custom/conf/app.example.ini modules/setting/actions.go https://codeberg.org/forgejo/forgejo/pulls/1413 (cherry picked from commit49529badce) Conflicts: custom/conf/app.example.ini docs/content/administration/config-cheat-sheet.en-us.md modules/setting/actions.go https://codeberg.org/forgejo/forgejo/pulls/1460 (cherry picked from commit00327b9b1f) (cherry picked from commit3b322e43d5) (cherry picked from commit492cc52059) Conflicts: modules/setting/actions.go https://codeberg.org/forgejo/forgejo/pulls/1573 (cherry picked from commit9027b655df) (cherry picked from commit4764383028) (cherry picked from commitfbb00fd1cf) (cherry picked from commit417cd6c801) (cherry picked from commit6b70773ad8) (cherry picked from commit9ba069327d) Conflicts: modules/setting/actions.go https://codeberg.org/forgejo/forgejo/pulls/1827 (cherry picked from commit727edf19ee) (cherry picked from commit689326ce20) (cherry picked from commit745d60aec4) (cherry picked from commitcb4ae4582c) (cherry picked from commit48d5ffe1c0) Conflicts: custom/conf/app.example.ini https://codeberg.org/forgejo/forgejo/pulls/2068 (cherry picked from commitbbd4725bfd) (cherry picked from commit04eda91d10) (cherry picked from commitd3621e4634) (cherry picked from commit08da63cc4d) (cherry picked from commitdc6d291b71)
This commit is contained in:
Earl Warren
parent
cb5448d15e
commit
4e5bf59579
|
|
@ -2582,10 +2582,9 @@ LEVEL = Info
|
|||
; [actions]
|
||||
;; Enable/Disable actions capabilities
|
||||
;ENABLED = true
|
||||
;;
|
||||
;; Default platform to get action plugins, `github` for `https://github.com`, `self` for the current Gitea instance.
|
||||
;DEFAULT_ACTIONS_URL = github
|
||||
;; Default artifact retention time in days. Artifacts could have their own retention periods by setting the `retention-days` option in `actions/upload-artifact` step.
|
||||
;; Default address to get action plugins, e.g. the default value means downloading from "https://code.forgejo.org/actions/checkout" for "uses: actions/checkout@v3"
|
||||
;DEFAULT_ACTIONS_URL = https://code.forgejo.org
|
||||
;; Default artifact retention time in days, default is 90 days
|
||||
;ARTIFACT_RETENTION_DAYS = 90
|
||||
;; Timeout to stop the task which have running status, but haven't been updated for a long time
|
||||
;ZOMBIE_TASK_TIMEOUT = 10m
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@ import (
|
|||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
)
|
||||
|
||||
// Actions settings
|
||||
|
|
@ -25,7 +23,7 @@ var (
|
|||
SkipWorkflowStrings []string `ìni:"SKIP_WORKFLOW_STRINGS"`
|
||||
}{
|
||||
Enabled: true,
|
||||
DefaultActionsURL: defaultActionsURLGitHub,
|
||||
DefaultActionsURL: defaultActionsURLForgejo,
|
||||
SkipWorkflowStrings: []string{"[skip ci]", "[ci skip]", "[no ci]", "[skip actions]", "[actions skip]"},
|
||||
}
|
||||
)
|
||||
|
|
@ -39,18 +37,14 @@ 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 string(url)
|
||||
}
|
||||
}
|
||||
|
||||
const (
|
||||
defaultActionsURLGitHub = "github" // https://github.com
|
||||
defaultActionsURLSelf = "self" // the root URL of the self-hosted Gitea instance
|
||||
// DefaultActionsURL only supports GitHub and the self-hosted Gitea.
|
||||
// It's intentionally not supported more, so please be cautious before adding more like "gitea" or "gitlab".
|
||||
// If you get some trouble with `uses: username/action_name@version` in your workflow,
|
||||
// please consider to use `uses: https://the_url_you_want_to_use/username/action_name@version` instead.
|
||||
defaultActionsURLForgejo = "https://code.forgejo.org"
|
||||
defaultActionsURLGitHub = "github" // https://github.com
|
||||
defaultActionsURLSelf = "self" // the root URL of the self-hosted instance
|
||||
)
|
||||
|
||||
func loadActionsFrom(rootCfg ConfigProvider) error {
|
||||
|
|
@ -60,19 +54,6 @@ func loadActionsFrom(rootCfg ConfigProvider) error {
|
|||
return fmt.Errorf("failed to map Actions settings: %v", err)
|
||||
}
|
||||
|
||||
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
|
||||
} else {
|
||||
return fmt.Errorf("unsupported [actions] DEFAULT_ACTIONS_URL: %q", urls)
|
||||
}
|
||||
}
|
||||
|
||||
// don't support to read configuration from [actions]
|
||||
Actions.LogStorage, err = getStorage(rootCfg, "actions_log", "", nil)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -110,7 +110,6 @@ func Test_getDefaultActionsURLForActions(t *testing.T) {
|
|||
tests := []struct {
|
||||
name string
|
||||
iniStr string
|
||||
wantErr assert.ErrorAssertionFunc
|
||||
wantURL string
|
||||
}{
|
||||
{
|
||||
|
|
@ -118,8 +117,7 @@ func Test_getDefaultActionsURLForActions(t *testing.T) {
|
|||
iniStr: `
|
||||
[actions]
|
||||
`,
|
||||
wantErr: assert.NoError,
|
||||
wantURL: "https://github.com",
|
||||
wantURL: "https://code.forgejo.org",
|
||||
},
|
||||
{
|
||||
name: "github",
|
||||
|
|
@ -127,7 +125,6 @@ func Test_getDefaultActionsURLForActions(t *testing.T) {
|
|||
[actions]
|
||||
DEFAULT_ACTIONS_URL = github
|
||||
`,
|
||||
wantErr: assert.NoError,
|
||||
wantURL: "https://github.com",
|
||||
},
|
||||
{
|
||||
|
|
@ -136,35 +133,15 @@ DEFAULT_ACTIONS_URL = github
|
|||
[actions]
|
||||
DEFAULT_ACTIONS_URL = self
|
||||
`,
|
||||
wantErr: assert.NoError,
|
||||
wantURL: "http://test_get_default_actions_url_for_actions:3000",
|
||||
},
|
||||
{
|
||||
name: "custom url",
|
||||
iniStr: `
|
||||
[actions]
|
||||
DEFAULT_ACTIONS_URL = https://gitea.com
|
||||
`,
|
||||
wantErr: assert.NoError,
|
||||
wantURL: "https://github.com",
|
||||
},
|
||||
{
|
||||
name: "custom urls",
|
||||
iniStr: `
|
||||
[actions]
|
||||
DEFAULT_ACTIONS_URL = https://gitea.com,https://github.com
|
||||
DEFAULT_ACTIONS_URL = https://example.com
|
||||
`,
|
||||
wantErr: assert.NoError,
|
||||
wantURL: "https://github.com",
|
||||
},
|
||||
{
|
||||
name: "invalid",
|
||||
iniStr: `
|
||||
[actions]
|
||||
DEFAULT_ACTIONS_URL = gitea
|
||||
`,
|
||||
wantErr: assert.Error,
|
||||
wantURL: "https://github.com",
|
||||
wantURL: "https://example.com",
|
||||
},
|
||||
}
|
||||
|
||||
|
|
@ -172,7 +149,7 @@ DEFAULT_ACTIONS_URL = gitea
|
|||
t.Run(tt.name, func(t *testing.T) {
|
||||
cfg, err := NewConfigProviderFromData(tt.iniStr)
|
||||
require.NoError(t, err)
|
||||
if !tt.wantErr(t, loadActionsFrom(cfg)) {
|
||||
if !assert.NoError(t, loadActionsFrom(cfg)) {
|
||||
return
|
||||
}
|
||||
assert.EqualValues(t, tt.wantURL, Actions.DefaultActionsURL.URL())
|
||||
|
|
|
|||
Loading…
Reference in a new issue