diff --git a/assets/images/help/repository/actions-general-tab.png b/assets/images/help/repository/actions-general-tab.png deleted file mode 100644 index 9979a5c2002e..000000000000 Binary files a/assets/images/help/repository/actions-general-tab.png and /dev/null differ diff --git a/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md b/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md index 142aec4a2715..7d166ec2fd96 100644 --- a/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md +++ b/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md @@ -49,14 +49,13 @@ You can add self-hosted runners to a single repository. To add a self-hosted run {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% data reusables.actions.settings-sidebar-actions %} -{% data reusables.actions.settings-sidebar-actions-runners-updated %} +{% data reusables.repositories.settings-sidebar-actions-runners %} 1. Click **New self-hosted runner**. {% data reusables.actions.self-hosted-runner-configure %} {% elsif ghae or ghes < 3.4 %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% data reusables.actions.settings-sidebar-actions-runners %} +{% data reusables.repositories.settings-sidebar-actions-runners %} 1. Under {% ifversion ghes > 3.1 or ghae or ghec %}"Runners"{% else %}"Self-hosted runners"{% endif %}, click **Add runner**. {% data reusables.actions.self-hosted-runner-configure %} {% endif %} @@ -71,14 +70,13 @@ You can add self-hosted runners at the organization level, where they can be use {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} -{% data reusables.actions.settings-sidebar-actions %} -{% data reusables.actions.settings-sidebar-actions-runners-updated %} +{% data reusables.organizations.settings-sidebar-actions-runners %} 1. Click **New runner**. {% data reusables.actions.self-hosted-runner-configure %} {% elsif ghae or ghes < 3.4 %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} -{% data reusables.actions.settings-sidebar-actions-runners %} +{% data reusables.organizations.settings-sidebar-actions-runners %} 1. Under {% ifversion ghes > 3.1 or ghae %}"Runners", click **Add new**, then click **New runner**.{% elsif ghes < 3.2 %}"Self-hosted runners", click **Add runner**."{% endif %} {% data reusables.actions.self-hosted-runner-configure %} {% endif %} diff --git a/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md b/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md index cfc81438f083..7f341f6f673f 100644 --- a/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md +++ b/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md @@ -47,7 +47,7 @@ When creating a group, you must choose a policy that defines which repositories{ {% ifversion ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} -{% data reusables.actions.settings-sidebar-actions-runner-groups %} +{% data reusables.organizations.settings-sidebar-actions-runner-groups %} 1. In the "Runner groups" section, click **New runner group**. 1. Enter a name for your runner group. {% data reusables.actions.runner-group-assign-policy-repo %} @@ -64,7 +64,7 @@ When creating a group, you must choose a policy that defines which repositories{ {% elsif ghae or ghes < 3.4 %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} -{% data reusables.actions.settings-sidebar-actions-runners %} +{% data reusables.organizations.settings-sidebar-actions-runner-groups %} 1. Under {% ifversion ghes > 3.1 or ghae %}"Runners"{% elsif ghes < 3.2 %}"Self-hosted runners"{% endif %}, click **Add new**, and then **New group**. ![Add runner group](/assets/images/help/settings/actions-org-add-runner-group.png) diff --git a/content/actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners.md b/content/actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners.md index 95f3f2a9f362..6c596084ba0f 100644 --- a/content/actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners.md +++ b/content/actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners.md @@ -23,7 +23,7 @@ shortTitle: Monitor & troubleshoot {% data reusables.actions.self-hosted-runner-management-permissions-required %} {% data reusables.actions.self-hosted-runner-navigate-repo-and-org %} -{% data reusables.actions.settings-sidebar-actions-runners %} +{% data reusables.organizations.settings-sidebar-actions-runners %} 1. Under {% ifversion fpt or ghes > 3.1 or ghae or ghec %}"Runners"{% else %}"Self-hosted runners"{% endif %}, you can view a list of registered runners, including the runner's name, labels, and status. The status can be one of the following: diff --git a/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md b/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md index aff70966d43c..7181af331686 100644 --- a/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md +++ b/content/actions/hosting-your-own-runners/removing-self-hosted-runners.md @@ -32,14 +32,13 @@ To remove a self-hosted runner from a user repository you must be the repository {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% data reusables.actions.settings-sidebar-actions %} -{% data reusables.actions.settings-sidebar-actions-runners-updated %} +{% data reusables.repositories.settings-sidebar-actions-runners %} {% data reusables.actions.settings-sidebar-actions-runner-selection %} {% data reusables.actions.self-hosted-runner-removing-a-runner-updated %} {% elsif ghae or ghes < 3.4 %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% data reusables.actions.settings-sidebar-actions-runners %} +{% data reusables.repositories.settings-sidebar-actions-runners %} {% data reusables.actions.self-hosted-runner-removing-a-runner %} {% endif %} @@ -59,14 +58,13 @@ To remove a self-hosted runner from an organization, you must be an organization {% ifversion fpt or ghes > 3.3 or ghec %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} -{% data reusables.actions.settings-sidebar-actions %} -{% data reusables.actions.settings-sidebar-actions-runners-updated %} +{% data reusables.organizations.settings-sidebar-actions-runners %} {% data reusables.actions.settings-sidebar-actions-runner-selection %} {% data reusables.actions.self-hosted-runner-removing-a-runner-updated %} {% elsif ghes < 3.4 or ghae %} {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} -{% data reusables.actions.settings-sidebar-actions-runners %} +{% data reusables.organizations.settings-sidebar-actions-runners %} {% data reusables.actions.self-hosted-runner-removing-a-runner %} {% endif %} diff --git a/content/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md b/content/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md index a9da74feb2e3..c6e61021987f 100644 --- a/content/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md +++ b/content/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md @@ -20,5 +20,5 @@ shortTitle: Configure retention period {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} -{% data reusables.organizations.settings-sidebar-actions %} +{% data reusables.organizations.settings-sidebar-actions-general %} {% data reusables.actions.change-retention-period-for-artifacts-logs %} diff --git a/content/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization.md b/content/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization.md index 79ae4bd4a465..a256cd4689bb 100644 --- a/content/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization.md +++ b/content/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization.md @@ -39,7 +39,7 @@ You can disable all workflows for an organization or set a policy that configure {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% data reusables.organizations.settings-sidebar-actions %} +{% data reusables.organizations.settings-sidebar-actions-general %} 1. Under **Policies**, select an option. ![Set actions policy for this organization](/assets/images/help/organizations/actions-policy.png) 1. Click **Save**. @@ -50,7 +50,7 @@ You can disable all workflows for an organization or set a policy that configure {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% data reusables.organizations.settings-sidebar-actions %} +{% data reusables.organizations.settings-sidebar-actions-general %} 1. Under **Policies**, select **Allow select actions** and add your required actions to the list. {%- ifversion ghes %} ![Add actions to allow list](/assets/images/help/organizations/actions-policy-allow-list.png) @@ -68,7 +68,7 @@ You can configure this behavior for an organization using the procedure below. M {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% data reusables.organizations.settings-sidebar-actions %} +{% data reusables.organizations.settings-sidebar-actions-general %} {% data reusables.actions.workflows-from-public-fork-setting %} {% data reusables.actions.workflow-run-approve-link %} @@ -87,7 +87,7 @@ You can configure this behavior for an organization using the procedure below. M {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% data reusables.organizations.settings-sidebar-actions %} +{% data reusables.organizations.settings-sidebar-actions-general %} {% data reusables.actions.private-repository-forks-configure %} {% endif %} @@ -105,7 +105,7 @@ You can set the default permissions for the `GITHUB_TOKEN` in the settings for y {% data reusables.profile.access_profile %} {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% data reusables.organizations.settings-sidebar-actions %} +{% data reusables.organizations.settings-sidebar-actions-general %} 1. Under **Workflow permissions**, choose whether you want the `GITHUB_TOKEN` to have read and write access for all scopes, or just read access for the `contents` scope. ![Set GITHUB_TOKEN permissions for this organization](/assets/images/help/settings/actions-workflow-permissions-organization.png) 1. Click **Save** to apply the settings. diff --git a/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md b/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md index 1f8316f4a239..96c6b3deca51 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md @@ -44,7 +44,7 @@ You can disable all workflows for a repository or set a policy that configures w {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% data reusables.repositories.settings-sidebar-actions %} +{% data reusables.repositories.settings-sidebar-actions-general %} 1. Under **Actions permissions**, select an option. ![Set actions policy for this organization](/assets/images/help/repository/actions-policy.png) @@ -57,7 +57,7 @@ You can disable all workflows for a repository or set a policy that configures w {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% data reusables.repositories.settings-sidebar-actions %} +{% data reusables.repositories.settings-sidebar-actions-general %} 1. Under **Actions permissions**, select **Allow select actions** and add your required actions to the list. {%- ifversion ghes %} @@ -77,7 +77,7 @@ You can configure this behavior for a repository using the procedure below. Modi {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% data reusables.repositories.settings-sidebar-actions %} +{% data reusables.repositories.settings-sidebar-actions-general %} {% data reusables.actions.workflows-from-public-fork-setting %} {% data reusables.actions.workflow-run-approve-link %} @@ -95,7 +95,7 @@ If a policy is disabled for an {% ifversion ghec or ghae or ghes %}enterprise or {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% data reusables.repositories.settings-sidebar-actions %} +{% data reusables.repositories.settings-sidebar-actions-general %} {% data reusables.actions.private-repository-forks-configure %} {% ifversion fpt or ghes > 3.1 or ghae or ghec %} @@ -111,7 +111,7 @@ The default permissions can also be configured in the organization settings. If {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% data reusables.repositories.settings-sidebar-actions %} +{% data reusables.repositories.settings-sidebar-actions-general %} 1. Under **Workflow permissions**, choose whether you want the `GITHUB_TOKEN` to have read and write access for all scopes, or just read access for the `contents` scope. ![Set GITHUB_TOKEN permissions for this repository](/assets/images/help/settings/actions-workflow-permissions-repository.png) @@ -128,7 +128,7 @@ You can use the steps below to configure whether {% if internal-actions%}actions 1. On {% data variables.product.prodname_dotcom %}, navigate to the main page of the internal repository. 1. Under your repository name, click {% octicon "gear" aria-label="The gear icon" %} **Settings**. -{% data reusables.repositories.settings-sidebar-actions %} +{% data reusables.repositories.settings-sidebar-actions-general %} 1. Under **Access**, choose one of the access settings: {% ifversion ghes > 3.4 or ghae-issue-6090 or ghec %}![Set the access to Actions components](/assets/images/help/settings/actions-access-settings.png){% else %}![Set the access to Actions components](/assets/images/enterprise/3.4/actions-access-settings.png){% endif %} @@ -151,5 +151,5 @@ You can also define a custom retention period for a specific artifact created by {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% data reusables.repositories.settings-sidebar-actions %} +{% data reusables.repositories.settings-sidebar-actions-general %} {% data reusables.actions.change-retention-period-for-artifacts-logs %} diff --git a/data/reusables/actions/change-retention-period-for-artifacts-logs.md b/data/reusables/actions/change-retention-period-for-artifacts-logs.md index daa2b9df62c2..42ee3bc464d7 100644 --- a/data/reusables/actions/change-retention-period-for-artifacts-logs.md +++ b/data/reusables/actions/change-retention-period-for-artifacts-logs.md @@ -1,2 +1,2 @@ -1. Under **Artifact and log retention duration**, enter a new value. +1. Under **Artifact and log retention**, enter a new value. 1. Click **Save** to apply the change. diff --git a/data/reusables/actions/self-hosted-runner-groups-navigate-to-repo-org-enterprise.md b/data/reusables/actions/self-hosted-runner-groups-navigate-to-repo-org-enterprise.md index 39720ea9726c..4819bd92eb97 100644 --- a/data/reusables/actions/self-hosted-runner-groups-navigate-to-repo-org-enterprise.md +++ b/data/reusables/actions/self-hosted-runner-groups-navigate-to-repo-org-enterprise.md @@ -1,17 +1,20 @@ {% ifversion fpt %} 1. Navigate to the main page of the repository or organization where your self-hosted runner groups are located. 2. Click {% octicon "gear" aria-label="The Settings gear" %} **Settings**. -3. In the left sidebar, click **Actions**. -4. Click **Runner groups**. +{% data reusables.organizations.settings-sidebar-actions-runner-groups %} {% elsif ghec or ghes or ghae %} 1. Navigate to where your self-hosted runner groups are located: - * **In an organization**: navigate to the main page and click {% octicon "gear" aria-label="The Settings gear" %} **Settings**.{% ifversion ghec %} - * **If using an enterprise account**: navigate to your enterprise account by clicking your profile photo in the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, then clicking **Your enterprises**, then clicking the enterprise.{% elsif ghes or ghae %} - * **If using an enterprise-level runner**: - 1. In the upper-right corner of any page, click {% octicon "rocket" aria-label="The rocket ship" %}. - 2. In the left sidebar, click **Enterprise overview**. - 3. In the enterprise sidebar, click {% octicon "law" aria-label="The law icon" %} **Policies**.{% endif %} + * **In an organization**: navigate to the main page and click {% octicon "gear" aria-label="The Settings gear" %} **Settings**. + * **If using an enterprise-level group**: + +{% indented_data_reference reusables.enterprise-accounts.access-enterprise spaces=5 %} 2. Navigate to the "Runner groups" settings: - * **In an organization**: Click **Actions** in the left sidebar, then click {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5091 %}**Runner groups**{% elsif ghae or ghes < 3.4 %}**Runners**{% endif %} below it.{% ifversion ghec or ghes or ghae %} - * {% ifversion ghec %}**If using an enterprise account**:{% elsif ghes or ghae %}**If using an enterprise-level runner**:{% endif %} Click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies", then click the {% ifversion ghec or ghes > 3.3 or ghae-issue-5091 %}**Runners groups**{% elsif ghae or ghes < 3.4 %}**Runners**{% endif %} tab.{% endif %} + * **In an organization**: + +{% indented_data_reference reusables.actions.settings-ui.settings-actions-runner-groups spaces=5 %} + * **If using an enterprise-level group**: + +{% indented_data_reference reusables.enterprise-accounts.policies-tab spaces=5 %} +{% indented_data_reference reusables.enterprise-accounts.actions-tab spaces=5 %} +{% indented_data_reference reusables.enterprise-accounts.actions-runner-groups-tab spaces=5 %} {% endif %} diff --git a/data/reusables/actions/self-hosted-runner-navigate-to-org-enterprise.md b/data/reusables/actions/self-hosted-runner-navigate-to-org-enterprise.md index f3dc1d11ca5c..589308b1e4b0 100644 --- a/data/reusables/actions/self-hosted-runner-navigate-to-org-enterprise.md +++ b/data/reusables/actions/self-hosted-runner-navigate-to-org-enterprise.md @@ -1,17 +1,20 @@ {% ifversion fpt %} -1. Navigate to the main page of the organization where your self-hosted runner group is registered. +1. Navigate to the main page of the organization where your self-hosted runner is registered. 2. Click {% octicon "gear" aria-label="The Settings gear" %} **Settings**. -3. In the left sidebar, click **Actions**. -4. Click **Runners**. +{% data reusables.organizations.settings-sidebar-actions-runners %} {% elsif ghec or ghes or ghae %} 1. Navigate to where your self-hosted runner is registered: * **In an organization**: navigate to the main page and click {% octicon "gear" aria-label="The Settings gear" %} **Settings**. - * {% ifversion ghec %}**If using an enterprise account**: navigate to your enterprise account by clicking your profile photo in the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, then clicking **Your enterprises**, then clicking the enterprise.{% elsif ghes or ghae %}**If using an enterprise-level runner**: + * **If using an enterprise-level runner**: - 1. In the upper-right corner of any page, click {% octicon "rocket" aria-label="The rocket ship" %}. - 1. In the left sidebar, click **Enterprise overview**. - 1. In the enterprise sidebar, {% octicon "law" aria-label="The law icon" %} **Policies**.{% endif %} +{% indented_data_reference reusables.enterprise-accounts.access-enterprise spaces=5 %} 1. Navigate to the {% data variables.product.prodname_actions %} settings: - * **In an organization**: Click **Actions** in the left sidebar{% ifversion fpt or ghec or ghes > 3.1 or ghae %}, then click **Runners**{% endif %}. - * {% ifversion ghec %}**If using an enterprise account**:{% elsif ghes or ghae %}**If using an enterprise-level runner**:{% endif %} Click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies"{% ifversion fpt or ghec or ghes > 3.1 or ghae %}, then click the **Runners** tab{% endif %}. + * **In an organization**: + +{% indented_data_reference reusables.actions.settings-ui.settings-actions-runners spaces=5 %} + * **If using an enterprise-level runner**: + +{% indented_data_reference reusables.enterprise-accounts.policies-tab spaces=5 %} +{% indented_data_reference reusables.enterprise-accounts.actions-tab spaces=5 %} +{% indented_data_reference reusables.enterprise-accounts.actions-runners-tab spaces=5 %} {% endif %} diff --git a/data/reusables/actions/self-hosted-runner-navigate-to-repo-org-enterprise.md b/data/reusables/actions/self-hosted-runner-navigate-to-repo-org-enterprise.md index afa35a6828c6..47a1613bb514 100644 --- a/data/reusables/actions/self-hosted-runner-navigate-to-repo-org-enterprise.md +++ b/data/reusables/actions/self-hosted-runner-navigate-to-repo-org-enterprise.md @@ -1,17 +1,22 @@ {% ifversion fpt %} 1. Navigate to the main page of the organization or repository where your self-hosted runner group is registered. 2. Click {% octicon "gear" aria-label="The Settings gear" %} **Settings**. -3. In the left sidebar, click **Actions**. -4. Click **Runners**. +{% data reusables.organizations.settings-sidebar-actions-runners %} {% elsif ghec or ghes or ghae %} 1. Navigate to where your self-hosted runner is registered: - * **In an organization or repository**: navigate to the main page and click {% octicon "gear" aria-label="The Settings gear" %} **Settings**. {% ifversion ghec %} - * **If using an enterprise account**: navigate to your enterprise account by clicking your profile photo in the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, then clicking **Your enterprises**, then clicking the enterprise.{% elsif ghes or ghae %} + * **In an organization or repository**: navigate to the main page and click {% octicon "gear" aria-label="The Settings gear" %} **Settings**. * **If using an enterprise-level runner**: - 1. In the upper-right corner of any page, click {% octicon "rocket" aria-label="The rocket ship" %}. - 2. In the left sidebar, click **Enterprise overview**. - 3. In the enterprise sidebar, click {% octicon "law" aria-label="The law icon" %} **Policies**.{% endif %} + +{% indented_data_reference reusables.enterprise-accounts.access-enterprise spaces=5 %} 2. Navigate to the {% data variables.product.prodname_actions %} settings: - * **In an organization or repository**: Click **Actions** in the left sidebar{% ifversion fpt or ghes > 3.1 or ghae or ghec %}, then click **Runners**{% endif %}.{% ifversion ghec or ghae or ghes %} - * {% ifversion ghec %}**If using an enterprise account**:{% elsif ghes or ghae %}**If using an enterprise-level runner**:{% endif %} Click **Actions** under "{% octicon "law" aria-label="The law icon" %} Policies"{% ifversion ghes > 3.1 or ghae or ghec %}, then click the **Runners** tab{% endif %}.{% endif %} + * **In an organization or repository**: + +{% indented_data_reference reusables.actions.settings-ui.settings-actions-runners spaces=5 %} + {%- ifversion ghec or ghae or ghes %} + * **If using an enterprise-level runner**: + +{% indented_data_reference reusables.enterprise-accounts.policies-tab spaces=5 %} +{% indented_data_reference reusables.enterprise-accounts.actions-tab spaces=5 %} +{% indented_data_reference reusables.enterprise-accounts.actions-runners-tab spaces=5 %} + {%- endif %} {% endif %} diff --git a/data/reusables/actions/settings-sidebar-actions-runner-groups.md b/data/reusables/actions/settings-sidebar-actions-runner-groups.md deleted file mode 100644 index 6272975d7a5c..000000000000 --- a/data/reusables/actions/settings-sidebar-actions-runner-groups.md +++ /dev/null @@ -1,2 +0,0 @@ -1. In the left sidebar, click **Actions**.{% ifversion fpt or ghes > 3.1 or ghae or ghec %} -1. In the left sidebar, under "Actions", click **Runner groups**.{% endif %} diff --git a/data/reusables/actions/settings-sidebar-actions-runners.md b/data/reusables/actions/settings-sidebar-actions-runners.md deleted file mode 100644 index 9fbb7b13ecc8..000000000000 --- a/data/reusables/actions/settings-sidebar-actions-runners.md +++ /dev/null @@ -1 +0,0 @@ -1. In the left sidebar, click **Actions**{% ifversion fpt or ghes > 3.1 or ghae or ghec %}, then click **Runners**{% endif %}. diff --git a/data/reusables/actions/settings-sidebar-actions.md b/data/reusables/actions/settings-sidebar-actions.md deleted file mode 100644 index d675bc3f9020..000000000000 --- a/data/reusables/actions/settings-sidebar-actions.md +++ /dev/null @@ -1 +0,0 @@ -1. In the left sidebar, click **Actions**. diff --git a/data/reusables/actions/settings-ui/settings-actions-general.md b/data/reusables/actions/settings-ui/settings-actions-general.md new file mode 100644 index 000000000000..2e08467c9092 --- /dev/null +++ b/data/reusables/actions/settings-ui/settings-actions-general.md @@ -0,0 +1,2 @@ +{% comment %}This reusable is only to be used in other repo/org/enterprise setting reusables.{%- endcomment -%} +1. In the left sidebar, click {% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}{% octicon "play" aria-label="The {% data variables.product.prodname_actions %} icon" %} **Actions**, then click **General**.{% else %}**Actions**.{% endif %} \ No newline at end of file diff --git a/data/reusables/actions/settings-ui/settings-actions-runner-groups.md b/data/reusables/actions/settings-ui/settings-actions-runner-groups.md new file mode 100644 index 000000000000..cb8aac7753bf --- /dev/null +++ b/data/reusables/actions/settings-ui/settings-actions-runner-groups.md @@ -0,0 +1,5 @@ +{% comment %}This reusable is only to be used in other repo/org/enterprise setting reusables.{%- endcomment -%} +1. In the left sidebar, click {% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}{% octicon "play" aria-label="The {% data variables.product.prodname_actions %} icon" %} **Actions**, then click **Runner groups**.{% else %}**Actions**.{% ifversion ghes > 3.3 or ghae-issue-5091 %} +1. In the left sidebar, under "Actions", click **Runner groups**. +{%- elsif ghes > 3.1 or ghae %} +1. In the left sidebar, under "Actions", click **Runners**.{% endif %}{% endif %} \ No newline at end of file diff --git a/data/reusables/actions/settings-ui/settings-actions-runners.md b/data/reusables/actions/settings-ui/settings-actions-runners.md new file mode 100644 index 000000000000..f54e9c4b40dc --- /dev/null +++ b/data/reusables/actions/settings-ui/settings-actions-runners.md @@ -0,0 +1,3 @@ +{% comment %}This reusable is only to be used in other repo/org/enterprise setting reusables.{%- endcomment -%} +1. In the left sidebar, click {% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}{% octicon "play" aria-label="The {% data variables.product.prodname_actions %} icon" %} **Actions**, then click **Runners**.{% else %}**Actions**.{% ifversion ghes > 3.1 or ghae %} +1. In the left sidebar, under "Actions", click **Runners**.{% endif %}{% endif %} \ No newline at end of file diff --git a/data/reusables/enterprise_management_console/actions.md b/data/reusables/enterprise_management_console/actions.md index fc69213b3b6a..b17efc47b38d 100644 --- a/data/reusables/enterprise_management_console/actions.md +++ b/data/reusables/enterprise_management_console/actions.md @@ -1,2 +1,3 @@ 1. In the left sidebar, click **Actions**. -![Actions tab in the settings sidebar](/assets/images/enterprise/management-console/sidebar-actions.png) + + ![Actions tab in the settings sidebar](/assets/images/enterprise/management-console/sidebar-actions.png) diff --git a/data/reusables/organizations/settings-sidebar-actions-general.md b/data/reusables/organizations/settings-sidebar-actions-general.md new file mode 100644 index 000000000000..c5ba757ebbec --- /dev/null +++ b/data/reusables/organizations/settings-sidebar-actions-general.md @@ -0,0 +1 @@ +{% data reusables.actions.settings-ui.settings-actions-general %} \ No newline at end of file diff --git a/data/reusables/organizations/settings-sidebar-actions-runner-groups.md b/data/reusables/organizations/settings-sidebar-actions-runner-groups.md new file mode 100644 index 000000000000..477154a0ae0f --- /dev/null +++ b/data/reusables/organizations/settings-sidebar-actions-runner-groups.md @@ -0,0 +1 @@ +{% data reusables.actions.settings-ui.settings-actions-runner-groups %} \ No newline at end of file diff --git a/data/reusables/organizations/settings-sidebar-actions-runners.md b/data/reusables/organizations/settings-sidebar-actions-runners.md new file mode 100644 index 000000000000..4a9ce38f658a --- /dev/null +++ b/data/reusables/organizations/settings-sidebar-actions-runners.md @@ -0,0 +1 @@ +{% data reusables.actions.settings-ui.settings-actions-runners %} \ No newline at end of file diff --git a/data/reusables/organizations/settings-sidebar-actions.md b/data/reusables/organizations/settings-sidebar-actions.md deleted file mode 100644 index d675bc3f9020..000000000000 --- a/data/reusables/organizations/settings-sidebar-actions.md +++ /dev/null @@ -1 +0,0 @@ -1. In the left sidebar, click **Actions**. diff --git a/data/reusables/repositories/settings-sidebar-actions-general.md b/data/reusables/repositories/settings-sidebar-actions-general.md new file mode 100644 index 000000000000..c5ba757ebbec --- /dev/null +++ b/data/reusables/repositories/settings-sidebar-actions-general.md @@ -0,0 +1 @@ +{% data reusables.actions.settings-ui.settings-actions-general %} \ No newline at end of file diff --git a/data/reusables/repositories/settings-sidebar-actions-runners.md b/data/reusables/repositories/settings-sidebar-actions-runners.md new file mode 100644 index 000000000000..4a9ce38f658a --- /dev/null +++ b/data/reusables/repositories/settings-sidebar-actions-runners.md @@ -0,0 +1 @@ +{% data reusables.actions.settings-ui.settings-actions-runners %} \ No newline at end of file diff --git a/data/reusables/repositories/settings-sidebar-actions.md b/data/reusables/repositories/settings-sidebar-actions.md deleted file mode 100644 index c350461a12d1..000000000000 --- a/data/reusables/repositories/settings-sidebar-actions.md +++ /dev/null @@ -1,5 +0,0 @@ -1. In the left sidebar, click **Actions**{% ifversion ghes > 3.4 or ghae-issue-6090 or ghec %}, then **General**. - - ![The Actions > General sidebar option](/assets/images/help/repository/actions-general-tab.png) - -{% else %}.{% endif %}