From 6bc69d76906a96f4b435551d84df99cf925ff467 Mon Sep 17 00:00:00 2001 From: mchammer01 <42146119+mchammer01@users.noreply.github.com> Date: Thu, 8 Apr 2021 15:32:18 +0100 Subject: [PATCH 01/13] remove mentions of GitHub ONE --- .../getting-started-with-github/githubs-products.md | 13 +------------ ...b-premium-support-for-github-enterprise-cloud.md | 2 +- data/reusables/gated-features/actions-shared.md | 2 +- data/reusables/gated-features/ghas.md | 2 +- data/reusables/gated-features/packages.md | 2 +- 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/content/github/getting-started-with-github/githubs-products.md b/content/github/getting-started-with-github/githubs-products.md index 4fbb23c3f039..3e4f2530fc96 100644 --- a/content/github/getting-started-with-github/githubs-products.md +++ b/content/github/getting-started-with-github/githubs-products.md @@ -98,15 +98,4 @@ In addition to the features available with {% data variables.product.prodname_te You can set up a trial to evaluate {% data variables.product.prodname_ghe_cloud %}. For more information, see "Setting up a trial of {% data variables.product.prodname_ghe_cloud %}." -For more information about hosting your own instance of [{% data variables.product.prodname_ghe_server %}](https://enterprise.github.com), contact {% data variables.contact.contact_enterprise_sales %}. {% data reusables.enterprise_installation.request-a-trial %} - -### {% data variables.product.prodname_ghe_one %} - -{% data variables.product.prodname_ghe_one %} includes [{% data variables.product.prodname_enterprise %}](#github-enterprise), plus: - -- {% data variables.contact.github_support %} {% data variables.product.premium_plus_support_plan %} -- {% data variables.product.prodname_insights %} -- {% data variables.product.prodname_GH_advanced_security %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}. For more information, see "[About {% data variables.product.prodname_GH_advanced_security %}](/github/getting-started-with-github/about-github-advanced-security)."{% endif %}{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.22" %}. For more information, see "[About {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning)."{% endif %} -- [{% data variables.product.prodname_learning %} for organizations](https://lab.github.com/organizations) - -For more information about signing up for {% data variables.product.prodname_ghe_one %}, contact {% data variables.contact.contact_enterprise_sales %}. +For more information about hosting your own instance of [{% data variables.product.prodname_ghe_server %}](https://enterprise.github.com), contact {% data variables.contact.contact_enterprise_sales %}. {% data reusables.enterprise_installation.request-a-trial %} \ No newline at end of file diff --git a/content/github/working-with-github-support/about-github-premium-support-for-github-enterprise-cloud.md b/content/github/working-with-github-support/about-github-premium-support-for-github-enterprise-cloud.md index 82c8aa865b54..a7657b346f9f 100644 --- a/content/github/working-with-github-support/about-github-premium-support-for-github-enterprise-cloud.md +++ b/content/github/working-with-github-support/about-github-premium-support-for-github-enterprise-cloud.md @@ -1,6 +1,6 @@ --- title: About GitHub Premium Support for GitHub Enterprise Cloud -intro: '{% data variables.contact.premium_support %} is a paid, supplemental support offering for {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_one %} customers.' +intro: '{% data variables.contact.premium_support %} is a paid, supplemental support offering for {% data variables.product.prodname_ghe_cloud %} customers.' redirect_from: - /articles/about-github-premium-support - /articles/about-github-premium-support-for-github-enterprise-cloud diff --git a/data/reusables/gated-features/actions-shared.md b/data/reusables/gated-features/actions-shared.md index d5bceb9ab191..1b9eb6926d8c 100644 --- a/data/reusables/gated-features/actions-shared.md +++ b/data/reusables/gated-features/actions-shared.md @@ -1 +1 @@ -{% data variables.product.prodname_actions %} is available with {% data variables.product.prodname_free_user %}, {% data variables.product.prodname_pro %}, {% data variables.product.prodname_free_team %} for organizations, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %}, {% data variables.product.prodname_ghe_one %}, and {% data variables.product.prodname_ghe_managed %}. {% data variables.product.prodname_actions %} is not available for private repositories owned by accounts using legacy per-repository plans. +{% data variables.product.prodname_actions %} is available with {% data variables.product.prodname_free_user %}, {% data variables.product.prodname_pro %}, {% data variables.product.prodname_free_team %} for organizations, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %}, and {% data variables.product.prodname_ghe_managed %}. {% data variables.product.prodname_actions %} is not available for private repositories owned by accounts using legacy per-repository plans. diff --git a/data/reusables/gated-features/ghas.md b/data/reusables/gated-features/ghas.md index fcf1b455c75f..fac3d40d4e3a 100644 --- a/data/reusables/gated-features/ghas.md +++ b/data/reusables/gated-features/ghas.md @@ -1 +1 @@ -{% data variables.product.prodname_GH_advanced_security %} licenses are available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}{% if currentVersion == "github-ae@latest" %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}. {% data variables.product.prodname_GH_advanced_security %} is also included in {% data variables.product.prodname_ghe_one %}{% if currentVersion == "free-pro-team@latest" %} and in all public repositories on {% data variables.product.prodname_dotcom_the_website %}{% endif %}. For more information, see "[About GitHub's products](/github/getting-started-with-github/githubs-products)." \ No newline at end of file +{% data variables.product.prodname_GH_advanced_security %} licenses are available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}{% if currentVersion == "github-ae@latest" %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}. {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_GH_advanced_security %} is also included in all public repositories on {% data variables.product.prodname_dotcom_the_website %}{% endif %}. For more information, see "[About GitHub's products](/github/getting-started-with-github/githubs-products)." \ No newline at end of file diff --git a/data/reusables/gated-features/packages.md b/data/reusables/gated-features/packages.md index e0cfb660456d..7007042e3326 100644 --- a/data/reusables/gated-features/packages.md +++ b/data/reusables/gated-features/packages.md @@ -1,4 +1,4 @@ -{% data variables.product.prodname_registry %} is available with {% data variables.product.prodname_free_user %}, {% data variables.product.prodname_pro %}, {% data variables.product.prodname_free_team %} for organizations, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %} 2.22, {% data variables.product.prodname_ghe_one %}, and {% data variables.product.prodname_ghe_managed %}. +{% data variables.product.prodname_registry %} is available with {% data variables.product.prodname_free_user %}, {% data variables.product.prodname_pro %}, {% data variables.product.prodname_free_team %} for organizations, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %} 2.22, and {% data variables.product.prodname_ghe_managed %}. {% if currentVersion == "free-pro-team@latest" %}
{% data variables.product.prodname_registry %} is not available for private repositories owned by accounts using legacy per-repository plans. Also, accounts using legacy per-repository plans cannot access {% data variables.product.prodname_github_container_registry %} since these accounts are billed by repository. {% data reusables.gated-features.more-info %} {% endif %} From 4b36a1ec08193f46c706e0392a3601359544be20 Mon Sep 17 00:00:00 2001 From: mchammer01 <42146119+mchammer01@users.noreply.github.com> Date: Thu, 8 Apr 2021 16:11:25 +0100 Subject: [PATCH 02/13] fix incorrect punctuationW --- data/reusables/gated-features/ghas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/gated-features/ghas.md b/data/reusables/gated-features/ghas.md index fac3d40d4e3a..166bbffcbe21 100644 --- a/data/reusables/gated-features/ghas.md +++ b/data/reusables/gated-features/ghas.md @@ -1 +1 @@ -{% data variables.product.prodname_GH_advanced_security %} licenses are available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}{% if currentVersion == "github-ae@latest" %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}. {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_GH_advanced_security %} is also included in all public repositories on {% data variables.product.prodname_dotcom_the_website %}{% endif %}. For more information, see "[About GitHub's products](/github/getting-started-with-github/githubs-products)." \ No newline at end of file +{% data variables.product.prodname_GH_advanced_security %} licenses are available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}{% if currentVersion == "github-ae@latest" %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_GH_advanced_security %} is also included in all public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[About GitHub's products](/github/getting-started-with-github/githubs-products)." \ No newline at end of file From 634d3d5b3c68c43b89f329d00bb06cb36dd7dbe8 Mon Sep 17 00:00:00 2001 From: mchammer01 <42146119+mchammer01@users.noreply.github.com> Date: Thu, 8 Apr 2021 16:43:24 +0100 Subject: [PATCH 03/13] remove hardcoded instances --- .../sharing-workflows-with-your-organization.md | 8 ++++---- .../github-enterprise-subscription-agreement.md | 4 +--- ...b-supplemental-terms-for-microsoft-volume-licensing.md | 4 +--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/content/actions/learn-github-actions/sharing-workflows-with-your-organization.md b/content/actions/learn-github-actions/sharing-workflows-with-your-organization.md index 9031151f9dc5..344b2dbc8dad 100644 --- a/content/actions/learn-github-actions/sharing-workflows-with-your-organization.md +++ b/content/actions/learn-github-actions/sharing-workflows-with-your-organization.md @@ -21,13 +21,13 @@ If you need to share workflows and other {% data variables.product.prodname_acti ### Creating a workflow template -Workflow templates can be created by users with write access to the organization's `.github` repository. The templates can then be used by organization members who have permission to create workflows. Workflow templates can be used to create new workflows in an organizations' public repositories; to use templates to create workflows in private repositories, the organization must be part of an enterprise or GitHub One plan. +Workflow templates can be created by users with write access to the organization's `.github` repository. The templates can then be used by organization members who have permission to create workflows. Workflow templates can be used to create new workflows in an organizations' public repositories; to use templates to create workflows in private repositories, the organization must be part of an enterprise plan. This procedure demonstrates how to create a workflow template and metadata file. The metadata file describes how the template is presented to users when they are creating a new workflow. 1. If it doesn't already exist, create a new public repository named `.github` in your organization. -1. Create a directory named `workflow-templates`. -1. Create your new workflow file inside the `workflow-templates` directory. +2. Create a directory named `workflow-templates`. +3. Create your new workflow file inside the `workflow-templates` directory. If you need to refer to a repository's default branch, you can use the `$default-branch` placeholder. When a workflow is created using your template, the placeholder will be automatically replaced with the name of the repository's default branch. @@ -52,7 +52,7 @@ This procedure demonstrates how to create a workflow template and metadata file. - name: Run a one-line script run: echo Hello from Octo Organization ``` -1. Create a metadata file inside the `workflow-templates` directory. The metadata file must have the same name as the workflow file, but instead of the `.yml` extension, it must be appended with `.properties.json`. For example, this file named `octo-organization-ci.properties.json` contains the metadata for a workflow file named `octo-organization-ci.yml`: +4. Create a metadata file inside the `workflow-templates` directory. The metadata file must have the same name as the workflow file, but instead of the `.yml` extension, it must be appended with `.properties.json`. For example, this file named `octo-organization-ci.properties.json` contains the metadata for a workflow file named `octo-organization-ci.yml`: ```yaml { "name": "Octo Organization Workflow", diff --git a/content/github/site-policy-deprecated/github-enterprise-subscription-agreement.md b/content/github/site-policy-deprecated/github-enterprise-subscription-agreement.md index f646a305e4c4..cf61a3170350 100644 --- a/content/github/site-policy-deprecated/github-enterprise-subscription-agreement.md +++ b/content/github/site-policy-deprecated/github-enterprise-subscription-agreement.md @@ -15,7 +15,7 @@ BY CLICKING THE "I AGREE" OR SIMILAR BUTTON OR BY USING ANY OF THE PRODUCTS (DEF This Agreement applies to the following GitHub offerings, as further defined below (collectively, the **"Products"**): -- GitHub Enterprise (comprised of GitHub Enterprise Server, which may include Add-On Software, and GitHub Enterprise Cloud) and GitHub One; +- GitHub Enterprise (comprised of GitHub Enterprise Server, which may include Add-On Software, and GitHub Enterprise Cloud); - Any Beta Previews; @@ -406,8 +406,6 @@ Some Service features may be subject to additional terms as set forth in the [Gi **"GitHub Insights"** or **“Insights”** means the Software feature which provides Customer with metrics, analytics, and recommendations relating to their use of the Software. GitHub Insights does not include legacy features of GitHub including Organization insights and repository insights. -**“GitHub One”** means the Product bundle which includes GitHub Enterprise, Advanced Security, Insights, Learning Lab for Enterprise Server, and Premium Plus or Engineering Direct Support. - **"Learning Lab for Enterprise Server"** means the Software feature that enables Users to learn about GitHub functionality, including associated Documentation. **"License Key"** means the data file used by the Software's access control mechanism that allows Customer to install, operate, and use the Software. diff --git a/content/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md b/content/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md index b58d9d35adf2..6872bb4641f5 100644 --- a/content/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md +++ b/content/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md @@ -15,7 +15,7 @@ The following GitHub Supplemental Terms (including any applicable Order Forms) s These Supplemental Terms apply to the following GitHub Offerings, as further defined below (collectively, the "**Products**"): -- GitHub Enterprise (comprised of GitHub Enterprise Server, which may include Add-on Software, and GitHub Enterprise Cloud) and GitHub One; +- GitHub Enterprise (comprised of GitHub Enterprise Server, which may include Add-on Software, and GitHub Enterprise Cloud); - Any related Support; and @@ -274,8 +274,6 @@ In the event of a conflict between the Supplemental Terms, on one hand, and an O **"GitHub Insights"** or **“Insights”** means the Software feature which provides Customer with metrics, analytics, and recommendations relating to their use of the Software. GitHub Insights does not include legacy features of GitHub including organization insights and repository insights. -**“GitHub One”** means the Product bundle which includes GitHub Enterprise, Advanced Security, Insights, Learning Lab for Enterprise Server, and Premium Plus or Engineering Direct Support. - **"Learning Lab for Enterprise Server"** means the Software feature that enables Users to learn about GitHub functionality, including associated Documentation. **"License Key"** means the data file used by the Software's access control mechanism that allows Customer to install, operate, and use the Software. From 8c1fd040a899322fb6e82394d799aaf7e20c3e7e Mon Sep 17 00:00:00 2001 From: amy Date: Fri, 9 Apr 2021 10:18:58 -0400 Subject: [PATCH 04/13] removing github insights reusable and references to it per https://github.com/github/docs-content/issues/4169#issuecomment-815921181 --- .../github-insights-and-data-protection-for-your-organization.md | 1 - .../metrics-available-with-github-insights.md | 1 - .../navigating-between-github-enterprise-and-github-insights.md | 1 - .../setting-your-timezone-for-github-insights.md | 1 - .../viewing-key-metrics-and-reports.md | 1 - .../about-data-in-github-insights.md | 1 - .../about-github-insights.md | 1 - ...e-connection-between-github-insights-and-github-enterprise.md | 1 - ...bling-a-link-between-github-insights-and-github-enterprise.md | 1 - .../installing-github-insights.md | 1 - .../managing-available-metrics-and-reports.md | 1 - .../managing-contributors-and-teams.md | 1 - .../managing-events.md | 1 - .../installing-and-configuring-github-insights/managing-goals.md | 1 - .../managing-organizations.md | 1 - .../managing-permissions-in-github-insights.md | 1 - .../managing-repositories.md | 1 - .../system-overview-for-github-insights.md | 1 - .../updating-github-insights.md | 1 - data/reusables/gated-features/github-insights.md | 1 - 20 files changed, 20 deletions(-) delete mode 100644 data/reusables/gated-features/github-insights.md diff --git a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md index a4b4d3fc5ea8..b4b374c69707 100644 --- a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md +++ b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md @@ -1,7 +1,6 @@ --- title: GitHub Insights and data protection for your organization intro: '{% data variables.product.prodname_insights %} analyzes your {% data variables.product.prodname_ghe_server %} data. This data could include personal data of individuals in your organization who may have the right to understand how such personal data is being used.' -product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/github-insights-and-data-protection-for-your-organization - /enterprise-server@2.22/github/site-policy/github-insights-and-data-protection-for-your-organization diff --git a/content/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights.md b/content/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights.md index 5fd646f6fb7a..7ecd3979d82b 100644 --- a/content/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights.md +++ b/content/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights.md @@ -1,6 +1,5 @@ --- title: Metrics available with GitHub Insights -product: '{% data reusables.gated-features.github-insights %}' intro: '{% data variables.product.prodname_insights %} includes a variety of metrics to give you visibility into your team''s software delivery process.' redirect_from: - /github/installing-and-configuring-github-insights/metrics-available-with-github-insights diff --git a/content/insights/exploring-your-usage-of-github-enterprise/navigating-between-github-enterprise-and-github-insights.md b/content/insights/exploring-your-usage-of-github-enterprise/navigating-between-github-enterprise-and-github-insights.md index 2896caf64e1f..795fdf2ffbaf 100644 --- a/content/insights/exploring-your-usage-of-github-enterprise/navigating-between-github-enterprise-and-github-insights.md +++ b/content/insights/exploring-your-usage-of-github-enterprise/navigating-between-github-enterprise-and-github-insights.md @@ -1,7 +1,6 @@ --- title: Navigating between GitHub Enterprise and GitHub Insights intro: '' -product: '{% data reusables.gated-features.github-insights %}' permissions: 'Anyone with access to {% data variables.product.prodname_insights %} can navigate between {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_insights %}.' versions: enterprise-server: '*' diff --git a/content/insights/exploring-your-usage-of-github-enterprise/setting-your-timezone-for-github-insights.md b/content/insights/exploring-your-usage-of-github-enterprise/setting-your-timezone-for-github-insights.md index d8b614cf207b..17c91b8cbe36 100644 --- a/content/insights/exploring-your-usage-of-github-enterprise/setting-your-timezone-for-github-insights.md +++ b/content/insights/exploring-your-usage-of-github-enterprise/setting-your-timezone-for-github-insights.md @@ -1,7 +1,6 @@ --- title: Setting your timezone for GitHub Insights intro: 'You can set the timezone for metrics you view in {% data variables.product.prodname_insights %}.' -product: '{% data reusables.gated-features.github-insights %}' permissions: 'Anyone with access to {% data variables.product.prodname_insights %} can set their own timezone.' versions: enterprise-server: '*' diff --git a/content/insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports.md b/content/insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports.md index 31703a70f56d..cb072241399c 100644 --- a/content/insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports.md +++ b/content/insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports.md @@ -1,7 +1,6 @@ --- title: Viewing key metrics and reports intro: You can view and filter key metrics and reports to help you understand and improve your software delivery process through data. -product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/viewing-and-filtering-key-metrics-and-reports permissions: 'Anyone with access to {% data variables.product.prodname_insights %} can view key metrics and reports.' diff --git a/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md b/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md index 90bf3a0747f4..f47e9ebe3614 100644 --- a/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md +++ b/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md @@ -1,7 +1,6 @@ --- title: About data in GitHub Insights intro: 'The data included in {% data variables.product.prodname_insights %} metrics is highly customizable.' -product: '{% data reusables.gated-features.github-insights %}' permissions: '' versions: enterprise-server: '*' diff --git a/content/insights/installing-and-configuring-github-insights/about-github-insights.md b/content/insights/installing-and-configuring-github-insights/about-github-insights.md index 05fcc49f8657..0bc475ceedf3 100644 --- a/content/insights/installing-and-configuring-github-insights/about-github-insights.md +++ b/content/insights/installing-and-configuring-github-insights/about-github-insights.md @@ -1,7 +1,6 @@ --- title: About GitHub Insights intro: '{% data variables.product.prodname_insights %} provides metrics and analytical reports to help engineering teams understand and improve their software delivery process.' -product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/about-github-insights versions: diff --git a/content/insights/installing-and-configuring-github-insights/configuring-the-connection-between-github-insights-and-github-enterprise.md b/content/insights/installing-and-configuring-github-insights/configuring-the-connection-between-github-insights-and-github-enterprise.md index 6cbf5de5cc19..93f8e312b3f1 100644 --- a/content/insights/installing-and-configuring-github-insights/configuring-the-connection-between-github-insights-and-github-enterprise.md +++ b/content/insights/installing-and-configuring-github-insights/configuring-the-connection-between-github-insights-and-github-enterprise.md @@ -1,7 +1,6 @@ --- title: Configuring the connection between GitHub Insights and GitHub Enterprise intro: 'You can manage how {% data variables.product.prodname_insights %} connects to {% data variables.product.prodname_enterprise %}.' -product: '{% data reusables.gated-features.github-insights %}' permissions: 'People with admin permissions to {% data variables.product.prodname_insights %} can configure the connection to {% data variables.product.prodname_enterprise %}.' versions: enterprise-server: '*' diff --git a/content/insights/installing-and-configuring-github-insights/enabling-a-link-between-github-insights-and-github-enterprise.md b/content/insights/installing-and-configuring-github-insights/enabling-a-link-between-github-insights-and-github-enterprise.md index 1a459b1fe16b..6c04c47614eb 100644 --- a/content/insights/installing-and-configuring-github-insights/enabling-a-link-between-github-insights-and-github-enterprise.md +++ b/content/insights/installing-and-configuring-github-insights/enabling-a-link-between-github-insights-and-github-enterprise.md @@ -1,7 +1,6 @@ --- title: Enabling a link between GitHub Insights and GitHub Enterprise intro: 'You can enable a link that will allow users to navigate from {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_insights %}.' -product: '{% data reusables.gated-features.github-insights %}' permissions: 'Site administrators for {% data variables.product.prodname_ghe_server %} can enable a link between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_insights %}.' redirect_from: - /github/installing-and-configuring-github-insights/navigating-between-github-insights-and-github-enterprise diff --git a/content/insights/installing-and-configuring-github-insights/installing-github-insights.md b/content/insights/installing-and-configuring-github-insights/installing-github-insights.md index 60e25e8f1a60..e992afa2bd90 100644 --- a/content/insights/installing-and-configuring-github-insights/installing-github-insights.md +++ b/content/insights/installing-and-configuring-github-insights/installing-github-insights.md @@ -1,7 +1,6 @@ --- title: Installing GitHub Insights intro: 'You can install {% data variables.product.prodname_insights %} and connect the standalone application to {% data variables.product.prodname_ghe_server %}.' -product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/installing-github-insights permissions: 'Organization owners in {% data variables.product.prodname_enterprise %} with read permissions to the `github/insights-releases` repository and administrative access to the application server can install {% data variables.product.prodname_insights %}.' diff --git a/content/insights/installing-and-configuring-github-insights/managing-available-metrics-and-reports.md b/content/insights/installing-and-configuring-github-insights/managing-available-metrics-and-reports.md index 63ef9134f532..8dcd5e92f5b5 100644 --- a/content/insights/installing-and-configuring-github-insights/managing-available-metrics-and-reports.md +++ b/content/insights/installing-and-configuring-github-insights/managing-available-metrics-and-reports.md @@ -1,7 +1,6 @@ --- title: Managing available metrics and reports intro: 'You can enable and disable specific metrics across {% data variables.product.prodname_insights %}.' -product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/managing-settings-in-github-insights permissions: 'People with admin permissions to {% data variables.product.prodname_insights %} can manage available metrics and reports.' diff --git a/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md b/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md index 7c054d9bdbda..2de84d7acf95 100644 --- a/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md +++ b/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md @@ -1,7 +1,6 @@ --- title: Managing contributors and teams intro: You can manage the people and teams included in metrics and reports. -product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/managing-contributors-and-teams permissions: 'People with admin permissions in {% data variables.product.prodname_insights %} can manage contributors and teams.' diff --git a/content/insights/installing-and-configuring-github-insights/managing-events.md b/content/insights/installing-and-configuring-github-insights/managing-events.md index e857b38f0984..d170abc9687d 100644 --- a/content/insights/installing-and-configuring-github-insights/managing-events.md +++ b/content/insights/installing-and-configuring-github-insights/managing-events.md @@ -1,7 +1,6 @@ --- title: Managing events intro: '{% data reusables.github-insights.events %}' -product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/creating-and-managing-events permissions: 'People with admin permissions to {% data variables.product.prodname_insights %} can manage events.' diff --git a/content/insights/installing-and-configuring-github-insights/managing-goals.md b/content/insights/installing-and-configuring-github-insights/managing-goals.md index 302025dbe3a0..20f15a6e9540 100644 --- a/content/insights/installing-and-configuring-github-insights/managing-goals.md +++ b/content/insights/installing-and-configuring-github-insights/managing-goals.md @@ -1,7 +1,6 @@ --- title: Managing goals intro: You can use goals to set targets for key metrics and measure success reaching those targets. -product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/creating-and-managing-goals permissions: 'Anyone with access to {% data variables.product.prodname_insights %} can manage goals.' diff --git a/content/insights/installing-and-configuring-github-insights/managing-organizations.md b/content/insights/installing-and-configuring-github-insights/managing-organizations.md index e4cf45dbab74..ebdcc9ee7fcd 100644 --- a/content/insights/installing-and-configuring-github-insights/managing-organizations.md +++ b/content/insights/installing-and-configuring-github-insights/managing-organizations.md @@ -1,7 +1,6 @@ --- title: Managing organizations intro: 'You can manage the {% data variables.product.prodname_enterprise %} organizations that are included in metrics.' -product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/managing-organizations permissions: 'People with admin permissions in {% data variables.product.prodname_insights %} can manage organizations.' diff --git a/content/insights/installing-and-configuring-github-insights/managing-permissions-in-github-insights.md b/content/insights/installing-and-configuring-github-insights/managing-permissions-in-github-insights.md index f74745251455..8bf8c4d00161 100644 --- a/content/insights/installing-and-configuring-github-insights/managing-permissions-in-github-insights.md +++ b/content/insights/installing-and-configuring-github-insights/managing-permissions-in-github-insights.md @@ -1,7 +1,6 @@ --- title: Managing permissions in GitHub Insights intro: 'You can update a user''s permissions in {% data variables.product.prodname_insights %}.' -product: '{% data reusables.gated-features.github-insights %}' permissions: 'People with admin permissions to {% data variables.product.prodname_insights %} can manage permissions.' versions: enterprise-server: '*' diff --git a/content/insights/installing-and-configuring-github-insights/managing-repositories.md b/content/insights/installing-and-configuring-github-insights/managing-repositories.md index 6f25f6b33352..266e4286521c 100644 --- a/content/insights/installing-and-configuring-github-insights/managing-repositories.md +++ b/content/insights/installing-and-configuring-github-insights/managing-repositories.md @@ -1,7 +1,6 @@ --- title: Managing repositories intro: 'You can manage the repositories connected to {% data variables.product.prodname_insights %} and the data included in metrics for each repository.' -product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/managing-repositories permissions: 'People with admin permissions in {% data variables.product.prodname_insights %} can manage repositories. ' diff --git a/content/insights/installing-and-configuring-github-insights/system-overview-for-github-insights.md b/content/insights/installing-and-configuring-github-insights/system-overview-for-github-insights.md index e42f1f43c224..17a49b1c4ae5 100644 --- a/content/insights/installing-and-configuring-github-insights/system-overview-for-github-insights.md +++ b/content/insights/installing-and-configuring-github-insights/system-overview-for-github-insights.md @@ -1,7 +1,6 @@ --- title: System overview for GitHub Insights intro: '{% data variables.product.prodname_insights %} is a standalone application which interfaces with {% data variables.product.prodname_enterprise %}.' -product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/system-overview-for-github-insights versions: diff --git a/content/insights/installing-and-configuring-github-insights/updating-github-insights.md b/content/insights/installing-and-configuring-github-insights/updating-github-insights.md index e17b23f341d4..20cca11a528a 100644 --- a/content/insights/installing-and-configuring-github-insights/updating-github-insights.md +++ b/content/insights/installing-and-configuring-github-insights/updating-github-insights.md @@ -1,7 +1,6 @@ --- title: Updating GitHub Insights intro: 'You can update to the latest version of {% data variables.product.prodname_insights %} to benefit from improvements and bug fixes.' -product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/updating-github-insights permissions: 'People with read permissions to the `github/insights-releases` repository and administrative access to the application server can update {% data variables.product.prodname_insights %}.' diff --git a/data/reusables/gated-features/github-insights.md b/data/reusables/gated-features/github-insights.md deleted file mode 100644 index f99859ae158f..000000000000 --- a/data/reusables/gated-features/github-insights.md +++ /dev/null @@ -1 +0,0 @@ -{% data variables.product.prodname_insights %} is available with {% data variables.product.prodname_ghe_one %}. For more information, see "[{% data variables.product.prodname_dotcom %}'s products](/articles/githubs-products)." From b1b21fd01e8e814d1bff3039871f60a94e859469 Mon Sep 17 00:00:00 2001 From: amy Date: Fri, 9 Apr 2021 10:44:53 -0400 Subject: [PATCH 05/13] removing variable and replacing with term as this is the only reference to it --- ...github-insights-and-data-protection-for-your-organization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md index b4b374c69707..3a33333da8af 100644 --- a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md +++ b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md @@ -13,7 +13,7 @@ topics: - legal --- -For more information about the terms that govern {% data variables.product.prodname_insights %}, see your {% data variables.product.prodname_ghe_one %} subscription agreement. +For more information about the terms that govern {% data variables.product.prodname_insights %}, see your GitHub One subscription agreement. For the avoidance of doubt, none of the foregoing information should be considered legal advice provided by {% data variables.product.prodname_dotcom %}. You are responsible for securing your own legal analysis of the information provided herein and for your compliance with privacy and data protection laws. It is up to you whether to use {% data variables.product.prodname_insights %} to process your employees’ and users’ data, and if you do so, you are solely responsible for conducting such processing in compliance with applicable law. From cd1119e461d8b9ba50024016651f2925ed773782 Mon Sep 17 00:00:00 2001 From: amy Date: Fri, 9 Apr 2021 15:46:49 -0400 Subject: [PATCH 06/13] removing github one --- data/variables/product.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/data/variables/product.yml b/data/variables/product.yml index 69505aedd0dd..6a0ad3076a64 100644 --- a/data/variables/product.yml +++ b/data/variables/product.yml @@ -22,7 +22,6 @@ prodname_dotcom_the_website: 'GitHub.com' prodname_ghe_server: 'GitHub Enterprise Server' prodname_ghe_cloud: 'GitHub Enterprise Cloud' prodname_ghe_managed: 'GitHub AE' -prodname_ghe_one: 'GitHub One' ## Use these variables when referring specifically to a location within a product product_location: >- From e8a65dba8a32181a60796a05bb4a29c08dea9bc3 Mon Sep 17 00:00:00 2001 From: Mike Surowiec Date: Sat, 10 Apr 2021 14:06:22 -0700 Subject: [PATCH 07/13] hydro: allow grouping of response stats by code --- lib/hydro.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/hydro.js b/lib/hydro.js index 357abe061e5d..0c74378f6f7d 100644 --- a/lib/hydro.js +++ b/lib/hydro.js @@ -76,8 +76,9 @@ module.exports = class Hydro { const res = await statsd.asyncTimer(doFetch, 'hydro.response_time')() - statsd.increment(`hydro.response_code.${res.status}`, 1) - statsd.increment('hydro.response_code.all', 1) + const statTags = [`response_code:${res.status}`] + statsd.increment(`hydro.response_code.${res.status}`, 1, statTags) + statsd.increment('hydro.response_code.all', 1, statTags) // Track hydro exceptions in Sentry, but don't track 503s because we can't do anything about service availability if (!res.ok && res.status !== 503) { From a59306d1cdab07cab2da6d39a78bbbaf06127f21 Mon Sep 17 00:00:00 2001 From: Felicity Chapman Date: Mon, 12 Apr 2021 15:31:10 +0100 Subject: [PATCH 08/13] Clarify advice on changes to translations (#18685) --- script/prevent-translation-commits.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/script/prevent-translation-commits.js b/script/prevent-translation-commits.js index 4580f2c97898..81bfc554bd77 100755 --- a/script/prevent-translation-commits.js +++ b/script/prevent-translation-commits.js @@ -21,12 +21,12 @@ const filenames = execSync('git diff --cached --name-only').toString().trim().sp const localizedFilenames = filenames.filter(filename => filename.startsWith('translations/')) if (localizedFilenames.length) { - console.error('\n✋ Uh oh! Detected changes in the /translations directory.') + console.error('\n✋ Uh oh! Detected changes to the following files in the `/translations` directory:') + console.table(localizedFilenames.join('\n')) console.error('The content in this directory is managed by our Crowdin integration and should not be edited directly in the repo.') console.error('For more information on how the localization process works, see translations/README.md') - console.error('\nPlease revert your changes to the following files:\n') - console.table(localizedFilenames.join('\n')) - console.error('\nTip #1: You can unstage these changes on the command line using `git restore --staged translations`\n') - console.error('\nTip #2: You can bypass this hook by setting `ALLOW_TRANSLATION_COMMITS=true` in your .env file.`\n') + console.error('\nIf you have accidentally edited these files, you can unstage these changes on the command line using `git restore --staged translations`\n') + console.error('\nIf you are performing a merge from `main`, you should bypass this hook by using ` git commit --no-verify`\n') + console.error('\nIf you need to edit translated files often, you can set `ALLOW_TRANSLATION_COMMITS=true` in your .env file.`\n') process.exit(1) } From f04533707994df164899748117b5847f5da260e0 Mon Sep 17 00:00:00 2001 From: mchammer01 <42146119+mchammer01@users.noreply.github.com> Date: Mon, 12 Apr 2021 15:46:20 +0100 Subject: [PATCH 09/13] reinstate variable product name and insights reusable --- data/reusables/gated-features/github-insights.md | 1 + data/variables/product.yml | 1 + 2 files changed, 2 insertions(+) create mode 100644 data/reusables/gated-features/github-insights.md diff --git a/data/reusables/gated-features/github-insights.md b/data/reusables/gated-features/github-insights.md new file mode 100644 index 000000000000..fb6b9703b2c8 --- /dev/null +++ b/data/reusables/gated-features/github-insights.md @@ -0,0 +1 @@ +{% data variables.product.prodname_insights %} is available with {% data variables.product.prodname_ghe_one %}. For more information, see "[{% data variables.product.prodname_dotcom %}'s products](/articles/githubs-products)." \ No newline at end of file diff --git a/data/variables/product.yml b/data/variables/product.yml index 6a0ad3076a64..cd4bc2292064 100644 --- a/data/variables/product.yml +++ b/data/variables/product.yml @@ -35,6 +35,7 @@ prodname_free_user: 'GitHub Free' prodname_pro: 'GitHub Pro' prodname_team: 'GitHub Team' prodname_free_team: 'GitHub Free' +prodname_ghe_one: 'GitHub One' prodname_enterprise_backup_utilities: 'GitHub Enterprise Server Backup Utilities' From a11906e3c2aa535f985b54439e33aacfd7586385 Mon Sep 17 00:00:00 2001 From: mchammer01 <42146119+mchammer01@users.noreply.github.com> Date: Mon, 12 Apr 2021 15:52:04 +0100 Subject: [PATCH 10/13] reinstate old (live) site-policy articles --- .../github-enterprise-subscription-agreement.md | 4 +++- ...ithub-supplemental-terms-for-microsoft-volume-licensing.md | 4 +++- ...thub-insights-and-data-protection-for-your-organization.md | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/content/github/site-policy-deprecated/github-enterprise-subscription-agreement.md b/content/github/site-policy-deprecated/github-enterprise-subscription-agreement.md index cf61a3170350..f646a305e4c4 100644 --- a/content/github/site-policy-deprecated/github-enterprise-subscription-agreement.md +++ b/content/github/site-policy-deprecated/github-enterprise-subscription-agreement.md @@ -15,7 +15,7 @@ BY CLICKING THE "I AGREE" OR SIMILAR BUTTON OR BY USING ANY OF THE PRODUCTS (DEF This Agreement applies to the following GitHub offerings, as further defined below (collectively, the **"Products"**): -- GitHub Enterprise (comprised of GitHub Enterprise Server, which may include Add-On Software, and GitHub Enterprise Cloud); +- GitHub Enterprise (comprised of GitHub Enterprise Server, which may include Add-On Software, and GitHub Enterprise Cloud) and GitHub One; - Any Beta Previews; @@ -406,6 +406,8 @@ Some Service features may be subject to additional terms as set forth in the [Gi **"GitHub Insights"** or **“Insights”** means the Software feature which provides Customer with metrics, analytics, and recommendations relating to their use of the Software. GitHub Insights does not include legacy features of GitHub including Organization insights and repository insights. +**“GitHub One”** means the Product bundle which includes GitHub Enterprise, Advanced Security, Insights, Learning Lab for Enterprise Server, and Premium Plus or Engineering Direct Support. + **"Learning Lab for Enterprise Server"** means the Software feature that enables Users to learn about GitHub functionality, including associated Documentation. **"License Key"** means the data file used by the Software's access control mechanism that allows Customer to install, operate, and use the Software. diff --git a/content/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md b/content/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md index 6872bb4641f5..b58d9d35adf2 100644 --- a/content/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md +++ b/content/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md @@ -15,7 +15,7 @@ The following GitHub Supplemental Terms (including any applicable Order Forms) s These Supplemental Terms apply to the following GitHub Offerings, as further defined below (collectively, the "**Products**"): -- GitHub Enterprise (comprised of GitHub Enterprise Server, which may include Add-on Software, and GitHub Enterprise Cloud); +- GitHub Enterprise (comprised of GitHub Enterprise Server, which may include Add-on Software, and GitHub Enterprise Cloud) and GitHub One; - Any related Support; and @@ -274,6 +274,8 @@ In the event of a conflict between the Supplemental Terms, on one hand, and an O **"GitHub Insights"** or **“Insights”** means the Software feature which provides Customer with metrics, analytics, and recommendations relating to their use of the Software. GitHub Insights does not include legacy features of GitHub including organization insights and repository insights. +**“GitHub One”** means the Product bundle which includes GitHub Enterprise, Advanced Security, Insights, Learning Lab for Enterprise Server, and Premium Plus or Engineering Direct Support. + **"Learning Lab for Enterprise Server"** means the Software feature that enables Users to learn about GitHub functionality, including associated Documentation. **"License Key"** means the data file used by the Software's access control mechanism that allows Customer to install, operate, and use the Software. diff --git a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md index 3a33333da8af..a4b4d3fc5ea8 100644 --- a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md +++ b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md @@ -1,6 +1,7 @@ --- title: GitHub Insights and data protection for your organization intro: '{% data variables.product.prodname_insights %} analyzes your {% data variables.product.prodname_ghe_server %} data. This data could include personal data of individuals in your organization who may have the right to understand how such personal data is being used.' +product: '{% data reusables.gated-features.github-insights %}' redirect_from: - /github/installing-and-configuring-github-insights/github-insights-and-data-protection-for-your-organization - /enterprise-server@2.22/github/site-policy/github-insights-and-data-protection-for-your-organization @@ -13,7 +14,7 @@ topics: - legal --- -For more information about the terms that govern {% data variables.product.prodname_insights %}, see your GitHub One subscription agreement. +For more information about the terms that govern {% data variables.product.prodname_insights %}, see your {% data variables.product.prodname_ghe_one %} subscription agreement. For the avoidance of doubt, none of the foregoing information should be considered legal advice provided by {% data variables.product.prodname_dotcom %}. You are responsible for securing your own legal analysis of the information provided herein and for your compliance with privacy and data protection laws. It is up to you whether to use {% data variables.product.prodname_insights %} to process your employees’ and users’ data, and if you do so, you are solely responsible for conducting such processing in compliance with applicable law. From 6eef0aa0b24d8d7160c2de4ee03bcd86963ac235 Mon Sep 17 00:00:00 2001 From: mchammer01 <42146119+mchammer01@users.noreply.github.com> Date: Mon, 12 Apr 2021 15:54:19 +0100 Subject: [PATCH 11/13] reinstate in original location --- data/variables/product.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/variables/product.yml b/data/variables/product.yml index cd4bc2292064..69505aedd0dd 100644 --- a/data/variables/product.yml +++ b/data/variables/product.yml @@ -22,6 +22,7 @@ prodname_dotcom_the_website: 'GitHub.com' prodname_ghe_server: 'GitHub Enterprise Server' prodname_ghe_cloud: 'GitHub Enterprise Cloud' prodname_ghe_managed: 'GitHub AE' +prodname_ghe_one: 'GitHub One' ## Use these variables when referring specifically to a location within a product product_location: >- @@ -35,7 +36,6 @@ prodname_free_user: 'GitHub Free' prodname_pro: 'GitHub Pro' prodname_team: 'GitHub Team' prodname_free_team: 'GitHub Free' -prodname_ghe_one: 'GitHub One' prodname_enterprise_backup_utilities: 'GitHub Enterprise Server Backup Utilities' From eb1ab1bfce1dbed83a735633cacb634b2c631358 Mon Sep 17 00:00:00 2001 From: Chiedo John <2156688+chiedo@users.noreply.github.com> Date: Mon, 12 Apr 2021 10:59:47 -0400 Subject: [PATCH 12/13] No How We Work automation for github/docs (#18697) Co-authored-by: chiedo --- .github/workflows/send-issues-to-how-how-we-work-boards.yml | 6 +++--- .github/workflows/send-prs-to-how-how-we-work-boards.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/send-issues-to-how-how-we-work-boards.yml b/.github/workflows/send-issues-to-how-how-we-work-boards.yml index 7b8b794b063f..a6b831091c24 100644 --- a/.github/workflows/send-issues-to-how-how-we-work-boards.yml +++ b/.github/workflows/send-issues-to-how-how-we-work-boards.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest continue-on-error: true steps: - - if: contains(github.event.issue.labels.*.name, 'engineering') && !contains(github.event.issue.labels.*.name, 'feature') && !contains(github.event.issue.labels.*.name, 'epic') + - if: (github.repository == 'github/docs-internal') && contains(github.event.issue.labels.*.name, 'engineering') && !contains(github.event.issue.labels.*.name, 'feature') && !contains(github.event.issue.labels.*.name, 'epic') uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9 with: github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }} @@ -31,7 +31,7 @@ jobs: } catch (error) { console.log(error); } - - if: contains(github.event.issue.labels.*.name, 'engineering') && contains(github.event.issue.labels.*.name, 'feature') + - if: (github.repository == 'github/docs-internal') && contains(github.event.issue.labels.*.name, 'engineering') && contains(github.event.issue.labels.*.name, 'feature') uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9 with: github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }} @@ -46,7 +46,7 @@ jobs: } catch (error) { console.log(error); } - - if: contains(github.event.issue.labels.*.name, 'engineering') && contains(github.event.issue.labels.*.name, 'epic') + - if: (github.repository == 'github/docs-internal') && contains(github.event.issue.labels.*.name, 'engineering') && contains(github.event.issue.labels.*.name, 'epic') uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9 with: github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }} diff --git a/.github/workflows/send-prs-to-how-how-we-work-boards.yml b/.github/workflows/send-prs-to-how-how-we-work-boards.yml index c1ab3934eec1..44e5e8d1a3dd 100644 --- a/.github/workflows/send-prs-to-how-how-we-work-boards.yml +++ b/.github/workflows/send-prs-to-how-how-we-work-boards.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest continue-on-error: true steps: - - if: (github.repository == 'github/docs-internal' || github.repository == 'github/docs') && contains(github.event.pull_request.labels.*.name, 'feature') + - if: (github.repository == 'github/docs-internal') && contains(github.event.pull_request.labels.*.name, 'feature') uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9 with: github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }} From 504193f4f325bf34ad72f521f0b93e23cfd1d15b Mon Sep 17 00:00:00 2001 From: "James M. Greene" Date: Mon, 12 Apr 2021 10:26:12 -0500 Subject: [PATCH 13/13] Use official auto-merge for repo-sync PRs (attempt #2) (#18628) * Add github-script step to enable GitHub's official auto-merge on repo-sync PRs * Reenable automerge action via label and fail gracefully if official auto-merge enablement fails --- .github/workflows/repo-sync.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 205cce2ab9c5..f75a6f410faa 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -163,6 +163,36 @@ jobs: console.log(`Branch is already up-to-date`) } + - name: Enable GitHub auto-merge + if: ${{ steps.find-pull-request.outputs.number }} + uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const pull = await github.pulls.get({ + ...context.repo, + pull_number: parseInt(${{ steps.find-pull-request.outputs.number }}) + }) + const pullNodeId = pull.data.node_id + console.log(`Pull request GraphQL Node ID: ${pullNodeId}`) + const mutation = `mutation ($id: ID!) { + enablePullRequestAutoMerge(input: { + pullRequestId: $id, + mergeMethod: MERGE + }) { + clientMutationId + } + }` + const variables = { + id: pullNodeId + } + const graph = await github.graphql(mutation, variables) + if (graph.errors && graph.errors.length > 0) { + console.error('ERROR! Failed to enable auto-merge:\n - ', graph.errors.map(error => error.message).join('\n - ')) + } else { + console.log('Auto-merge enabled!') + } + - name: Send Slack notification if workflow fails uses: someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd if: failure()