Skip to content

Commit 00327b9

Browse files
earl-warrenearl-warren
committed
[CI] DEFAULT_ACTIONS_URL = https://codeberg.org
[CI] Revert "Restrict `[actions].DEFAULT_ACTIONS_URL` to only `github` or `self` (go-gitea#25581)" This reverts commit 67bd9d4. (cherry picked from commit 0547e94023a545fafe82e280dd809e7efd6d86e2) (cherry picked from commit d21ad654ad0abc243913532326e916899b0e387c) (cherry picked from commit b905e9d8386c58206234a417769cc17b3be34b62) (cherry picked from commit 251a5bf235b1723bc2bc324f9e8c03a8668bb5ae) (cherry picked from commit b370e4769423bec92b0f265f3e3b2b683640024d) (cherry picked from commit 2cc28d078507027749c14a5448e949ab54b79c66) (cherry picked from commit ed870a39e98fbb69c435a3a3ef0434fe6163ebe7) (cherry picked from commit 7bb0c4654ecbbd2feee2c74034c1e2cdca0d6828) (cherry picked from commit bab1f552c385e3c7d0faa33d28fb8087780ea834) 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 commit 52b364ddbd9ac82b9e6f9c1767db2d6b36165011) (cherry picked from commit 99887cd5673f6da49664b590ad60c83fdbe25a4a) (cherry picked from commit cd5788782aa5c2ee8baecd57ca1e7882f0854453) (cherry picked from commit 71c698a704d307c568f247710550d48f27cca4ce) (cherry picked from commit 71386241dd741a4fa0b67d59a07d84ac31e0b870) (cherry picked from commit b7ab05aeac12c44acd117d5a4e8d7b4da2ba4aa7) (cherry picked from commit e78b9ca59c0af867f94d9c9bfae48f8cc9381224) (cherry picked from commit edb3adf4606af94ed0ab0bd844ef626a39a99297) (cherry picked from commit 3e400881975340be9148c4549a744395a6dac665) [BRANDING] DEFAULT_ACTIONS_URL = https://code.forgejo.org (cherry picked from commit d0e4512c902dec669da36a055a2ea54adb107e0f) (cherry picked from commit 8ba6e047095e9ecb107d77361664fa83b03ddaa2) (cherry picked from commit 63490810449b4189ed8538a22182fde1bc89c057) (cherry picked from commit e06bd444951d1fd94a71ce3d591a8f397f456363) (cherry picked from commit d58219d8e13f0b4007108d78f8f6f96a1d842c2c) (cherry picked from commit 052f2c2aa45ae1aa1d59aaf713db4f771f62773b) (cherry picked from commit 29dc39538631f65eaaf5dcc4eeb747fbc68d7498) (cherry picked from commit 9eef3f59f3a1347ccc7d6d3704c9f5b40a3b6555) (cherry picked from commit d650391fedd5b2cac313e29d51cc8689d885a594) (cherry picked from commit c2e6e8c55d955f1e2b781c983f05319dddcc4386) (cherry picked from commit e28a47741dc668421989b6b2310365a6611b23b7) [CI] DEFAULT_ACTIONS_URL support for self & github (squash) Refs: https://codeberg.org/forgejo/forgejo/issues/1062 (cherry picked from commit 74cc25376ecd1dbab57abffe286ae1f918057cfd) (cherry picked from commit 405430708ffbebcfd2cefdcdfd24a540985b817c) (cherry picked from commit 0274a6dee7f383bcd6b65b995b991b5ab0ee635a) (cherry picked from commit be5cda0fd03b265367c551aefed83456be257075) (cherry picked from commit d27474849fc4dd4ec958c04b7be06eced8b74d6e) (cherry picked from commit 4a5e9e2d81f89b5c9e6782d1c24880d62f802d7f) (cherry picked from commit 65b31906b27c7a6ecaecf74af748e046c51aa7a8) (cherry picked from commit 13cf0b0963bb110db7229dc5cd4d202e7dec11fb) Conflicts: custom/conf/app.example.ini modules/setting/actions.go https://codeberg.org/forgejo/forgejo/pulls/1413 (cherry picked from commit 49529badce0a43a07a786b22e2a8705a6a1dbe63) 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
1 parent 9631958 commit 00327b9

File tree

3 files changed

+11
-54
lines changed

3 files changed

+11
-54
lines changed

‎custom/conf/app.example.ini‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2563,9 +2563,8 @@ LEVEL = Info
25632563
; [actions]
25642564
;; Enable/Disable actions capabilities
25652565
;ENABLED = true
2566-
;;
2567-
;; Default platform to get action plugins, `github` for `https://github.com`, `self` for the current Gitea instance.
2568-
;DEFAULT_ACTIONS_URL = github
2566+
;; 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"
2567+
;DEFAULT_ACTIONS_URL = https://code.forgejo.org
25692568
;; Default artifact retention time in days, default is 90 days
25702569
;ARTIFACT_RETENTION_DAYS = 90
25712570

‎modules/setting/actions.go‎

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ package setting
66
import (
77
"fmt"
88
"strings"
9-
10-
"code.gitea.io/gitea/modules/log"
119
)
1210

1311
// Actions settings
@@ -20,7 +18,7 @@ var (
2018
DefaultActionsURL defaultActionsURL `ini:"DEFAULT_ACTIONS_URL"`
2119
}{
2220
Enabled: true,
23-
DefaultActionsURL: defaultActionsURLGitHub,
21+
DefaultActionsURL: defaultActionsURLForgejo,
2422
}
2523
)
2624

@@ -33,18 +31,14 @@ func (url defaultActionsURL) URL() string {
3331
case defaultActionsURLSelf:
3432
return strings.TrimSuffix(AppURL, "/")
3533
default:
36-
// This should never happen, but just in case, use GitHub as fallback
37-
return "https://github.com"
34+
return string(url)
3835
}
3936
}
4037

4138
const (
42-
defaultActionsURLGitHub = "github" // https://github.com
43-
defaultActionsURLSelf = "self" // the root URL of the self-hosted Gitea instance
44-
// DefaultActionsURL only supports GitHub and the self-hosted Gitea.
45-
// It's intentionally not supported more, so please be cautious before adding more like "gitea" or "gitlab".
46-
// If you get some trouble with `uses: username/action_name@version` in your workflow,
47-
// please consider to use `uses: https://the_url_you_want_to_use/username/action_name@version` instead.
39+
defaultActionsURLForgejo = "https://code.forgejo.org"
40+
defaultActionsURLGitHub = "github" // https://github.com
41+
defaultActionsURLSelf = "self" // the root URL of the self-hosted instance
4842
)
4943

5044
func loadActionsFrom(rootCfg ConfigProvider) error {
@@ -54,19 +48,6 @@ func loadActionsFrom(rootCfg ConfigProvider) error {
5448
return fmt.Errorf("failed to map Actions settings: %v", err)
5549
}
5650

57-
if urls := string(Actions.DefaultActionsURL); urls != defaultActionsURLGitHub && urls != defaultActionsURLSelf {
58-
url := strings.Split(urls, ",")[0]
59-
if strings.HasPrefix(url, "https://") || strings.HasPrefix(url, "http://") {
60-
log.Error("[actions] DEFAULT_ACTIONS_URL does not support %q as custom URL any longer, fallback to %q",
61-
urls,
62-
defaultActionsURLGitHub,
63-
)
64-
Actions.DefaultActionsURL = defaultActionsURLGitHub
65-
} else {
66-
return fmt.Errorf("unsupported [actions] DEFAULT_ACTIONS_URL: %q", urls)
67-
}
68-
}
69-
7051
// don't support to read configuration from [actions]
7152
Actions.LogStorage, err = getStorage(rootCfg, "actions_log", "", nil)
7253
if err != nil {

‎modules/setting/actions_test.go‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -110,24 +110,21 @@ func Test_getDefaultActionsURLForActions(t *testing.T) {
110110
tests := []struct {
111111
name string
112112
iniStr string
113-
wantErr assert.ErrorAssertionFunc
114113
wantURL string
115114
}{
116115
{
117116
name: "default",
118117
iniStr: `
119118
[actions]
120119
`,
121-
wantErr: assert.NoError,
122-
wantURL: "https://github.com",
120+
wantURL: "https://code.forgejo.org",
123121
},
124122
{
125123
name: "github",
126124
iniStr: `
127125
[actions]
128126
DEFAULT_ACTIONS_URL = github
129127
`,
130-
wantErr: assert.NoError,
131128
wantURL: "https://github.com",
132129
},
133130
{
@@ -136,43 +133,23 @@ DEFAULT_ACTIONS_URL = github
136133
[actions]
137134
DEFAULT_ACTIONS_URL = self
138135
`,
139-
wantErr: assert.NoError,
140136
wantURL: "http://test_get_default_actions_url_for_actions:3000",
141137
},
142-
{
143-
name: "custom url",
144-
iniStr: `
145-
[actions]
146-
DEFAULT_ACTIONS_URL = https://gitea.com
147-
`,
148-
wantErr: assert.NoError,
149-
wantURL: "https://github.com",
150-
},
151138
{
152139
name: "custom urls",
153140
iniStr: `
154141
[actions]
155-
DEFAULT_ACTIONS_URL = https://gitea.com,https://github.com
142+
DEFAULT_ACTIONS_URL = https://example.com
156143
`,
157-
wantErr: assert.NoError,
158-
wantURL: "https://github.com",
159-
},
160-
{
161-
name: "invalid",
162-
iniStr: `
163-
[actions]
164-
DEFAULT_ACTIONS_URL = gitea
165-
`,
166-
wantErr: assert.Error,
167-
wantURL: "https://github.com",
144+
wantURL: "https://example.com",
168145
},
169146
}
170147

171148
for _, tt := range tests {
172149
t.Run(tt.name, func(t *testing.T) {
173150
cfg, err := NewConfigProviderFromData(tt.iniStr)
174151
require.NoError(t, err)
175-
if !tt.wantErr(t, loadActionsFrom(cfg)) {
152+
if !assert.NoError(t, loadActionsFrom(cfg)) {
176153
return
177154
}
178155
assert.EqualValues(t, tt.wantURL, Actions.DefaultActionsURL.URL())

0 commit comments

Comments
 (0)