[CI] DEFAULT_ACTIONS_URL = https://codeberg.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
This commit is contained in:
parent
9631958a82
commit
00327b9b1f
|
@ -2563,9 +2563,8 @@ LEVEL = Info
|
||||||
; [actions]
|
; [actions]
|
||||||
;; Enable/Disable actions capabilities
|
;; Enable/Disable actions capabilities
|
||||||
;ENABLED = true
|
;ENABLED = true
|
||||||
;;
|
;; 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 platform to get action plugins, `github` for `https://github.com`, `self` for the current Gitea instance.
|
;DEFAULT_ACTIONS_URL = https://code.forgejo.org
|
||||||
;DEFAULT_ACTIONS_URL = github
|
|
||||||
;; Default artifact retention time in days, default is 90 days
|
;; Default artifact retention time in days, default is 90 days
|
||||||
;ARTIFACT_RETENTION_DAYS = 90
|
;ARTIFACT_RETENTION_DAYS = 90
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,6 @@ package setting
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"code.gitea.io/gitea/modules/log"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Actions settings
|
// Actions settings
|
||||||
|
@ -20,7 +18,7 @@ var (
|
||||||
DefaultActionsURL defaultActionsURL `ini:"DEFAULT_ACTIONS_URL"`
|
DefaultActionsURL defaultActionsURL `ini:"DEFAULT_ACTIONS_URL"`
|
||||||
}{
|
}{
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
DefaultActionsURL: defaultActionsURLGitHub,
|
DefaultActionsURL: defaultActionsURLForgejo,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -33,18 +31,14 @@ func (url defaultActionsURL) URL() string {
|
||||||
case defaultActionsURLSelf:
|
case defaultActionsURLSelf:
|
||||||
return strings.TrimSuffix(AppURL, "/")
|
return strings.TrimSuffix(AppURL, "/")
|
||||||
default:
|
default:
|
||||||
// This should never happen, but just in case, use GitHub as fallback
|
return string(url)
|
||||||
return "https://github.com"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
defaultActionsURLGitHub = "github" // https://github.com
|
defaultActionsURLForgejo = "https://code.forgejo.org"
|
||||||
defaultActionsURLSelf = "self" // the root URL of the self-hosted Gitea instance
|
defaultActionsURLGitHub = "github" // https://github.com
|
||||||
// DefaultActionsURL only supports GitHub and the self-hosted Gitea.
|
defaultActionsURLSelf = "self" // the root URL of the self-hosted instance
|
||||||
// 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.
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func loadActionsFrom(rootCfg ConfigProvider) error {
|
func loadActionsFrom(rootCfg ConfigProvider) error {
|
||||||
|
@ -54,19 +48,6 @@ func loadActionsFrom(rootCfg ConfigProvider) error {
|
||||||
return fmt.Errorf("failed to map Actions settings: %v", err)
|
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]
|
// don't support to read configuration from [actions]
|
||||||
Actions.LogStorage, err = getStorage(rootCfg, "actions_log", "", nil)
|
Actions.LogStorage, err = getStorage(rootCfg, "actions_log", "", nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -110,7 +110,6 @@ func Test_getDefaultActionsURLForActions(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
iniStr string
|
iniStr string
|
||||||
wantErr assert.ErrorAssertionFunc
|
|
||||||
wantURL string
|
wantURL string
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
|
@ -118,8 +117,7 @@ func Test_getDefaultActionsURLForActions(t *testing.T) {
|
||||||
iniStr: `
|
iniStr: `
|
||||||
[actions]
|
[actions]
|
||||||
`,
|
`,
|
||||||
wantErr: assert.NoError,
|
wantURL: "https://code.forgejo.org",
|
||||||
wantURL: "https://github.com",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "github",
|
name: "github",
|
||||||
|
@ -127,7 +125,6 @@ func Test_getDefaultActionsURLForActions(t *testing.T) {
|
||||||
[actions]
|
[actions]
|
||||||
DEFAULT_ACTIONS_URL = github
|
DEFAULT_ACTIONS_URL = github
|
||||||
`,
|
`,
|
||||||
wantErr: assert.NoError,
|
|
||||||
wantURL: "https://github.com",
|
wantURL: "https://github.com",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -136,35 +133,15 @@ DEFAULT_ACTIONS_URL = github
|
||||||
[actions]
|
[actions]
|
||||||
DEFAULT_ACTIONS_URL = self
|
DEFAULT_ACTIONS_URL = self
|
||||||
`,
|
`,
|
||||||
wantErr: assert.NoError,
|
|
||||||
wantURL: "http://test_get_default_actions_url_for_actions:3000",
|
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",
|
name: "custom urls",
|
||||||
iniStr: `
|
iniStr: `
|
||||||
[actions]
|
[actions]
|
||||||
DEFAULT_ACTIONS_URL = https://gitea.com,https://github.com
|
DEFAULT_ACTIONS_URL = https://example.com
|
||||||
`,
|
`,
|
||||||
wantErr: assert.NoError,
|
wantURL: "https://example.com",
|
||||||
wantURL: "https://github.com",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "invalid",
|
|
||||||
iniStr: `
|
|
||||||
[actions]
|
|
||||||
DEFAULT_ACTIONS_URL = gitea
|
|
||||||
`,
|
|
||||||
wantErr: assert.Error,
|
|
||||||
wantURL: "https://github.com",
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -172,7 +149,7 @@ DEFAULT_ACTIONS_URL = gitea
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
cfg, err := NewConfigProviderFromData(tt.iniStr)
|
cfg, err := NewConfigProviderFromData(tt.iniStr)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
if !tt.wantErr(t, loadActionsFrom(cfg)) {
|
if !assert.NoError(t, loadActionsFrom(cfg)) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
assert.EqualValues(t, tt.wantURL, Actions.DefaultActionsURL.URL())
|
assert.EqualValues(t, tt.wantURL, Actions.DefaultActionsURL.URL())
|
||||||
|
|
Loading…
Reference in New Issue