From 16ea83e4d65654d238416fc4d2af763264faf134 Mon Sep 17 00:00:00 2001 From: Martin Lopes Date: Thu, 13 May 2021 15:25:50 +1000 Subject: [PATCH] Simplified reusables --- .../adding-self-hosted-runners.md | 19 +++---------------- ...and-troubleshooting-self-hosted-runners.md | 3 --- .../removing-self-hosted-runners.md | 6 ------ .../self-hosted-runner-removing-a-runner.md | 6 +----- .../settings-sidebar-actions-runners.md | 1 - .../organizations/settings-sidebar-actions.md | 3 +-- .../repositories/settings-sidebar-actions.md | 3 +-- 7 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 data/reusables/organizations/settings-sidebar-actions-runners.md 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 cd8075f587..1000f76438 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 @@ -37,11 +37,7 @@ You can add self-hosted runners to a single repository. To add a self-hosted run {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.repositories.settings-sidebar-actions %} -{% if currentVersion == "free-pro-team@latest" %} -{% data reusables.organizations.settings-sidebar-actions-runners %} -{% else %} -1. Under "Self-hosted runners," click **Add runner**. -{% endif %} +1. Under {% if currentVersion == "free-pro-team@latest" %}_Runners_{% else %}_Self-hosted runners_{% endif %}, click **Add runner**. {% data reusables.github-actions.self-hosted-runner-configure %} {% data reusables.github-actions.self-hosted-runner-check-installation-success %} @@ -52,12 +48,7 @@ You can add self-hosted runners at the organization level, where they can be use {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} {% data reusables.organizations.settings-sidebar-actions %} -{% if currentVersion == "free-pro-team@latest" %} -{% data reusables.organizations.settings-sidebar-actions-runners %} -1. Under "Runners", click **Add new**, then click **New runner**. -{% else %} -1. Under "Self-hosted runners," click **Add new**, then click **New runner**. -{% endif %} +1. Under {% if currentVersion == "free-pro-team@latest" %}_Runners_{% else %}_Self-hosted runners_{% endif %}, click **Add runner**. {% data reusables.github-actions.self-hosted-runner-configure %} {% data reusables.github-actions.self-hosted-runner-check-installation-success %} @@ -76,11 +67,7 @@ To add a self-hosted runner at the enterprise level of {% data variables.product {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} {% data reusables.enterprise-accounts.actions-tab %} -{% if currentVersion == "free-pro-team@latest" %} -1. Click the **Runners** tab. -{% else %} -1. Click the **Self-hosted runners** tab. -{% endif %} +1. Click the {% if currentVersion == "free-pro-team@latest" %}**Runners**{% else %}**Self-hosted runners**{% endif %} tab. 1. Click **Add new**, then click **New runner**. New runners are assigned to the default group. You can modify the runner's group after you've registered the runner. For more information, see "[Managing access to self-hosted runners](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group)." {% data reusables.github-actions.self-hosted-runner-configure %} {% data reusables.github-actions.self-hosted-runner-check-installation-success %} 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 47c8573d3a..36ce0d3105 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 @@ -24,9 +24,6 @@ defaultPlatform: linux {% data reusables.github-actions.self-hosted-runner-navigate-repo-and-org %} {% data reusables.organizations.settings-sidebar-actions %} -{% if currentVersion == "free-pro-team@latest" %} -{% data reusables.organizations.settings-sidebar-actions-runners %} -{% endif %} 1. Under {% if currentVersion == "free-pro-team@latest" %}"Runners"{% else %}"Self-hosted runners"{% endif %}, you can view a list of registered runners, including the runner's name, labels, and status. ![Runner list](/assets/images/help/settings/actions-runner-list.png) 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 f9fa791b57..bd60f15dcd 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 @@ -33,9 +33,6 @@ To remove a self-hosted runner from a user repository you must be the repository {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.repositories.settings-sidebar-actions %} -{% if currentVersion == "free-pro-team@latest" %} -{% data reusables.organizations.settings-sidebar-actions-runners %} -{% endif %} {% data reusables.github-actions.self-hosted-runner-removing-a-runner %} ### Removing a runner from an organization @@ -55,9 +52,6 @@ To remove a self-hosted runner from an organization, you must be an organization {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} {% data reusables.repositories.settings-sidebar-actions %} -{% if currentVersion == "free-pro-team@latest" %} -{% data reusables.organizations.settings-sidebar-actions-runners %} -{% endif %} {% data reusables.github-actions.self-hosted-runner-removing-a-runner %} ### Removing a runner from an enterprise diff --git a/data/reusables/github-actions/self-hosted-runner-removing-a-runner.md b/data/reusables/github-actions/self-hosted-runner-removing-a-runner.md index ca0eb2f516..4ae5b8e290 100644 --- a/data/reusables/github-actions/self-hosted-runner-removing-a-runner.md +++ b/data/reusables/github-actions/self-hosted-runner-removing-a-runner.md @@ -1,8 +1,4 @@ -{% if currentVersion == "free-pro-team@latest" %} -1. Under **Runners**, locate the runner in the list. If your runner is in a group, click {% octicon "chevron-down" aria-label="The downwards chevron" %} to expand the list. -{% else %} -1. Under **Self-hosted runners**, locate the runner in the list. If your runner is in a group, click {% octicon "chevron-down" aria-label="The downwards chevron" %} to expand the list. -{% endif %} +1. Under {% if currentVersion == "free-pro-team@latest" %}_Runners_{% else %}_Self-hosted runners_{% endif %}, locate the runner in the list. If your runner is in a group, click {% octicon "chevron-down" aria-label="The downwards chevron" %} to expand the list. 1. Click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} next to the runner you want to remove, then click **Remove**. ![Removing a self-hosted runner setting](/assets/images/help/settings/actions-runner-remove.png) diff --git a/data/reusables/organizations/settings-sidebar-actions-runners.md b/data/reusables/organizations/settings-sidebar-actions-runners.md deleted file mode 100644 index 6c7bfb080c..0000000000 --- a/data/reusables/organizations/settings-sidebar-actions-runners.md +++ /dev/null @@ -1 +0,0 @@ -1. In the left sidebar, click **Runners**. diff --git a/data/reusables/organizations/settings-sidebar-actions.md b/data/reusables/organizations/settings-sidebar-actions.md index 6b452c4058..0414de7296 100644 --- a/data/reusables/organizations/settings-sidebar-actions.md +++ b/data/reusables/organizations/settings-sidebar-actions.md @@ -1,2 +1 @@ -1. In the left sidebar, click **Actions**. - ![Actions setting](/assets/images/help/settings/settings-sidebar-actions.png) +1. In the left sidebar, click **Actions**{% if currentVersion == "free-pro-team@latest" %}, then **Runners**{% endif %}. diff --git a/data/reusables/repositories/settings-sidebar-actions.md b/data/reusables/repositories/settings-sidebar-actions.md index 6b452c4058..0414de7296 100644 --- a/data/reusables/repositories/settings-sidebar-actions.md +++ b/data/reusables/repositories/settings-sidebar-actions.md @@ -1,2 +1 @@ -1. In the left sidebar, click **Actions**. - ![Actions setting](/assets/images/help/settings/settings-sidebar-actions.png) +1. In the left sidebar, click **Actions**{% if currentVersion == "free-pro-team@latest" %}, then **Runners**{% endif %}.