From fddc70f37b4015ef0fde40a155df031da6cab06b Mon Sep 17 00:00:00 2001 From: CaiCandong <1290147055@qq.com> Date: Mon, 24 Jul 2023 16:30:08 +0800 Subject: [PATCH 1/4] fix acions settings url --- docs/content/doc/usage/actions/act-runner.en-us.md | 6 +++--- docs/content/doc/usage/actions/act-runner.zh-cn.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/content/doc/usage/actions/act-runner.en-us.md b/docs/content/doc/usage/actions/act-runner.en-us.md index ddab43530e2e..1f4475508f9c 100644 --- a/docs/content/doc/usage/actions/act-runner.en-us.md +++ b/docs/content/doc/usage/actions/act-runner.en-us.md @@ -110,9 +110,9 @@ Note that the repository may still use instance-level or organization-level runn The level of the runner determines where to obtain the registration token. -- Instance level: The admin settings page, like `/admin/runners`. -- Organization level: The organization settings page, like `//settings/runners`. -- Repository level: The repository settings page, like `///settings/runners`. +- Instance level: The admin settings page, like `/admin/actions/runners`. +- Organization level: The organization settings page, like `//settings/actions/runners`. +- Repository level: The repository settings page, like `///settings/actions/runners`. If you cannot see the settings page, please make sure that you have the right permissions and that Actions have been enabled. diff --git a/docs/content/doc/usage/actions/act-runner.zh-cn.md b/docs/content/doc/usage/actions/act-runner.zh-cn.md index fb202e307821..cc5728290073 100644 --- a/docs/content/doc/usage/actions/act-runner.zh-cn.md +++ b/docs/content/doc/usage/actions/act-runner.zh-cn.md @@ -109,9 +109,9 @@ docker run -v $(pwd)/config.yaml:/config.yaml -e CONFIG_FILE=/config.yaml ... Runner级别决定了从哪里获取注册令牌。 -- 实例级别：管理员设置页面，例如 `/admin/runners`。 -- 组织级别：组织设置页面，例如 `//settings/runners`。 -- 存储库级别：存储库设置页面，例如 `///settings/runners`。 +- 实例级别：管理员设置页面，例如 `/admin/actions/runners`。 +- 组织级别：组织设置页面，例如 `//settings/actions/runners`。 +- 存储库级别：存储库设置页面，例如 `///settings/actions/runners`。 如果您无法看到设置页面，请确保您具有正确的权限并且已启用 Actions。 From bf0e0b4613bae7b040023899dc451db60573b223 Mon Sep 17 00:00:00 2001 From: CaiCandong <1290147055@qq.com> Date: Mon, 24 Jul 2023 17:03:44 +0800 Subject: [PATCH 2/4] guide user create the appropriate level runner --- docs/content/doc/usage/actions/quickstart.en-us.md | 8 ++++++-- docs/content/doc/usage/actions/quickstart.zh-cn.md | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/content/doc/usage/actions/quickstart.en-us.md b/docs/content/doc/usage/actions/quickstart.en-us.md index 132d11f13f58..4554fb857f0a 100644 --- a/docs/content/doc/usage/actions/quickstart.en-us.md +++ b/docs/content/doc/usage/actions/quickstart.en-us.md @@ -65,8 +65,12 @@ It is always a bad idea to use a loopback address such as `127.0.0.1` or `localh If you are unsure which address to use, the LAN address is usually the right choice. `token` is used for authentication and identification, such as `P2U1U0oB4XaRCi8azcngmPCLbRpUGapalhmddh23`. -It is one-time use only and cannot be used to register multiple runners. -You can obtain tokens from `/admin/runners`. +It is one-time use only and cannot be used to register multiple runners. +You can obtain different levels of 'tokens' from the following places to create the corresponding level of' runners': + +- Instance level: The admin settings page, like `/admin/actions/runners`. +- Organization level: The organization settings page, like `//settings/actions/runners`. +- Repository level: The repository settings page, like `///settings/actions/runners`. ![register runner](/images/usage/actions/register-runner.png) diff --git a/docs/content/doc/usage/actions/quickstart.zh-cn.md b/docs/content/doc/usage/actions/quickstart.zh-cn.md index 7a06b6edbd63..5c84fed6f8b4 100644 --- a/docs/content/doc/usage/actions/quickstart.zh-cn.md +++ b/docs/content/doc/usage/actions/quickstart.zh-cn.md @@ -66,7 +66,10 @@ Runner和Job容器（由Runner启动以执行Job）将连接到此地址。 `token` 用于身份验证和标识，例如 `P2U1U0oB4XaRCi8azcngmPCLbRpUGapalhmddh23`。 它只能使用一次，并且不能用于注册多个Runner。 -您可以从 `/admin/runners` 获取令牌。 +您可以从以下位置获取不同级别的`token`,从而创建出相应级别的`runner` +- 实例级别：管理员设置页面，例如 `/admin/actions/runners`。 +- 组织级别：组织设置页面，例如 `//settings/actions/runners`。 +- 存储库级别：存储库设置页面，例如 `///settings/actions/runners`。 ![register runner](/images/usage/actions/register-runner.png) From 6d201f33d3f08101f5eebed77d13691870b43487 Mon Sep 17 00:00:00 2001 From: CaiCandong <1290147055@qq.com> Date: Mon, 24 Jul 2023 17:19:27 +0800 Subject: [PATCH 3/4] fix lint --- docs/content/doc/usage/actions/quickstart.en-us.md | 2 +- docs/content/doc/usage/actions/quickstart.zh-cn.md | 1 + docs/content/doc/usage/secrets.en-us.md | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/content/doc/usage/actions/quickstart.en-us.md b/docs/content/doc/usage/actions/quickstart.en-us.md index 4554fb857f0a..829f1a62c0b1 100644 --- a/docs/content/doc/usage/actions/quickstart.en-us.md +++ b/docs/content/doc/usage/actions/quickstart.en-us.md @@ -65,7 +65,7 @@ It is always a bad idea to use a loopback address such as `127.0.0.1` or `localh If you are unsure which address to use, the LAN address is usually the right choice. `token` is used for authentication and identification, such as `P2U1U0oB4XaRCi8azcngmPCLbRpUGapalhmddh23`. -It is one-time use only and cannot be used to register multiple runners. +It is one-time use only and cannot be used to register multiple runners. You can obtain different levels of 'tokens' from the following places to create the corresponding level of' runners': - Instance level: The admin settings page, like `/admin/actions/runners`. diff --git a/docs/content/doc/usage/actions/quickstart.zh-cn.md b/docs/content/doc/usage/actions/quickstart.zh-cn.md index 5c84fed6f8b4..1893300b618f 100644 --- a/docs/content/doc/usage/actions/quickstart.zh-cn.md +++ b/docs/content/doc/usage/actions/quickstart.zh-cn.md @@ -67,6 +67,7 @@ Runner和Job容器（由Runner启动以执行Job）将连接到此地址。 `token` 用于身份验证和标识，例如 `P2U1U0oB4XaRCi8azcngmPCLbRpUGapalhmddh23`。 它只能使用一次，并且不能用于注册多个Runner。 您可以从以下位置获取不同级别的`token`,从而创建出相应级别的`runner` + - 实例级别：管理员设置页面，例如 `/admin/actions/runners`。 - 组织级别：组织设置页面，例如 `//settings/actions/runners`。 - 存储库级别：存储库设置页面，例如 `///settings/actions/runners`。 diff --git a/docs/content/doc/usage/secrets.en-us.md b/docs/content/doc/usage/secrets.en-us.md index fe7677fc316f..82d714bd00e5 100644 --- a/docs/content/doc/usage/secrets.en-us.md +++ b/docs/content/doc/usage/secrets.en-us.md @@ -18,7 +18,7 @@ menu: # Secrets Secrets allow you to store sensitive information in your user, organization or repository. -Secrets are available on Gitea 1.19+ and are only visible in 1.20+ when ACTIONS are enabled +Secrets are available on Gitea 1.19+ and are only visible in 1.20+ when ACTIONS are enabled # Naming your secrets From 80d82e060a147980dbc977116f3b372bce0c19fe Mon Sep 17 00:00:00 2001 From: Jason Song Date: Mon, 24 Jul 2023 17:48:39 +0800 Subject: [PATCH 4/4] Update docs/content/doc/usage/secrets.en-us.md --- docs/content/doc/usage/secrets.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/usage/secrets.en-us.md b/docs/content/doc/usage/secrets.en-us.md index 82d714bd00e5..c82628f50cf8 100644 --- a/docs/content/doc/usage/secrets.en-us.md +++ b/docs/content/doc/usage/secrets.en-us.md @@ -18,7 +18,7 @@ menu: # Secrets Secrets allow you to store sensitive information in your user, organization or repository. -Secrets are available on Gitea 1.19+ and are only visible in 1.20+ when ACTIONS are enabled +Secrets are available on Gitea 1.19+ and are only visible in 1.20+ when ACTIONS are enabled. # Naming your secrets