mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-26 18:00:34 +00:00
[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
This commit is contained in:
parent
ebff0513db
commit
49529badce
4 changed files with 39 additions and 65 deletions
|
@ -2563,9 +2563,8 @@ LEVEL = Info
|
||||||
; [actions]
|
; [actions]
|
||||||
;; Enable/Disable actions capabilities
|
;; Enable/Disable actions capabilities
|
||||||
;ENABLED = false
|
;ENABLED = false
|
||||||
;;
|
;; 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
|
||||||
|
|
||||||
|
|
|
@ -1385,23 +1385,40 @@ PROXY_HOSTS = *.github.com
|
||||||
## Actions (`actions`)
|
## Actions (`actions`)
|
||||||
|
|
||||||
- `ENABLED`: **false**: Enable/Disable actions capabilities
|
- `ENABLED`: **false**: Enable/Disable actions capabilities
|
||||||
- `DEFAULT_ACTIONS_URL`: **github**: Default platform to get action plugins, `github` for `https://github.com`, `self` for the current Gitea instance.
|
- `DEFAULT_ACTIONS_URL`: **https://gitea.com**: Default address to get action plugins, e.g. the default value means downloading from "<https://gitea.com/actions/checkout>" for "uses: actions/checkout@v3"
|
||||||
- `STORAGE_TYPE`: **local**: Storage type for actions logs, `local` for local disk or `minio` for s3 compatible object storage service, default is `local` or other name defined with `[storage.xxx]`
|
- `STORAGE_TYPE`: **local**: Storage type for actions logs, `local` for local disk or `minio` for s3 compatible object storage service, default is `local` or other name defined with `[storage.xxx]`
|
||||||
- `MINIO_BASE_PATH`: **actions_log/**: Minio base path on the bucket only available when STORAGE_TYPE is `minio`
|
- `MINIO_BASE_PATH`: **actions_log/**: Minio base path on the bucket only available when STORAGE_TYPE is `minio`
|
||||||
- `ARTIFACT_RETENTION_DAYS`: **90**: Number of days to keep artifacts. Set to 0 to disable artifact retention. Default is 90 days if not set.
|
- `ARTIFACT_RETENTION_DAYS`: **90**: Number of days to keep artifacts. Set to 0 to disable artifact retention. Default is 90 days if not set.
|
||||||
|
|
||||||
`DEFAULT_ACTIONS_URL` indicates where the Gitea Actions runners should find the actions with relative path.
|
`DEFAULT_ACTIONS_URL` indicates where should we find the relative path action plugin. i.e. when use an action in a workflow file like
|
||||||
For example, `uses: actions/checkout@v3` means `https://github.com/actions/checkout@v3` since the value of `DEFAULT_ACTIONS_URL` is `github`.
|
|
||||||
And it can be changed to `self` to make it `root_url_of_your_gitea/actions/checkout@v3`.
|
|
||||||
|
|
||||||
Please note that using `self` is not recommended for most cases, as it could make names globally ambiguous.
|
```yaml
|
||||||
Additionally, it requires you to mirror all the actions you need to your Gitea instance, which may not be worth it.
|
name: versions
|
||||||
Therefore, please use `self` only if you understand what you are doing.
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
- releases/*
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
```
|
||||||
|
|
||||||
In earlier versions (<= 1.19), `DEFAULT_ACTIONS_URL` cound be set to any custom URLs like `https://gitea.com` or `http://your-git-server,https://gitea.com`, and the default value was `https://gitea.com`.
|
Now we need to know how to get actions/checkout, this configuration is the default git server to get it. That means we will get the repository via git clone ${DEFAULT_ACTIONS_URL}/actions/checkout and fetch tag v3.
|
||||||
However, later updates removed those options, and now the only options are `github` and `self`, with the default value being `github`.
|
|
||||||
However, if you want to use actions from other git server, you can use a complete URL in `uses` field, it's supported by Gitea (but not GitHub).
|
To help people who don't want to mirror these actions in their git instances, the default value is https://gitea.com
|
||||||
Like `uses: https://gitea.com/actions/checkout@v3` or `uses: http://your-git-server/actions/checkout@v3`.
|
To help people run actions totally in their network, they can change the value and copy all necessary action repositories into their git server.
|
||||||
|
|
||||||
|
Of course we should support the form in future PRs like
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
steps:
|
||||||
|
- uses: gitea.com/actions/checkout@v3
|
||||||
|
```
|
||||||
|
|
||||||
|
although Github don't support this form.
|
||||||
|
|
||||||
## Other (`other`)
|
## Other (`other`)
|
||||||
|
|
||||||
|
|
|
@ -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: false,
|
Enabled: false,
|
||||||
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 (
|
||||||
|
defaultActionsURLForgejo = "https://code.forgejo.org"
|
||||||
defaultActionsURLGitHub = "github" // https://github.com
|
defaultActionsURLGitHub = "github" // https://github.com
|
||||||
defaultActionsURLSelf = "self" // the root URL of the self-hosted Gitea instance
|
defaultActionsURLSelf = "self" // the root URL of the self-hosted 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.
|
|
||||||
)
|
)
|
||||||
|
|
||||||
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 a new issue