From bf9ff78332631508eb5991ee4d3f9fb9d59ca24b Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Fri, 8 Aug 2025 15:49:19 +0200 Subject: [PATCH 1/3] [EDI] Ensure `/billing/how-tos/pay-third-parties/*` complies with EDI requirements (#57018) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../cancel-marketplace-app.md | 4 +-- .../pay-third-parties/cancel-sponsorship.md | 35 +++++++++++++++++++ .../downgrade-marketplace-app.md | 2 +- .../downgrade-sponsorship.md | 25 ++----------- .../pay-third-parties/end-sponsorship.md | 7 ++-- .../how-tos/pay-third-parties/index.md | 1 + .../upgrade-marketplace-app.md | 2 +- .../pay-third-parties/upgrade-sponsorship.md | 4 +-- 8 files changed, 47 insertions(+), 33 deletions(-) create mode 100644 content/billing/how-tos/pay-third-parties/cancel-sponsorship.md diff --git a/content/billing/how-tos/pay-third-parties/cancel-marketplace-app.md b/content/billing/how-tos/pay-third-parties/cancel-marketplace-app.md index a83516ee39..7792d3a85a 100644 --- a/content/billing/how-tos/pay-third-parties/cancel-marketplace-app.md +++ b/content/billing/how-tos/pay-third-parties/cancel-marketplace-app.md @@ -25,9 +25,7 @@ contentType: how-tos {% ifversion fpt %}{% data reusables.marketplace.marketplace-app-page %}{% endif %} -When you cancel an app, your subscription remains active until the end of your current billing cycle. The cancellation takes effect on your next billing date. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace). - -When you cancel a free trial on a paid plan, your subscription is immediately canceled and you will lose access to the app. If you don't cancel your free trial within the trial period, the payment method on file for your account will be charged for the plan you chose at the end of the trial period. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace). +**When you cancel a paid app, your access and subscription will end on your next billing date. If you cancel during a free trial, you will lose access immediately**. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace). {% data reusables.marketplace.downgrade-marketplace-only %} diff --git a/content/billing/how-tos/pay-third-parties/cancel-sponsorship.md b/content/billing/how-tos/pay-third-parties/cancel-sponsorship.md new file mode 100644 index 0000000000..a61cea210c --- /dev/null +++ b/content/billing/how-tos/pay-third-parties/cancel-sponsorship.md @@ -0,0 +1,35 @@ +--- +title: Canceling a sponsorship +intro: You can cancel your sponsorship. +versions: + fpt: '*' + ghec: '*' +topics: + - Billing + - Cancellation + - Sponsors +shortTitle: Cancel sponsorship +contentType: how-tos +--- + +**When you cancel a sponsorship, the change will become effective on your next billing date**. {% data reusables.sponsors.no-refunds %} + +## Canceling a sponsorship + +{% data reusables.user-settings.access_settings %} +{% data reusables.user-settings.billing_plans %} +{% data reusables.sponsors.billing-switcher %} +1. Under "{% data variables.product.prodname_sponsors %}", next to the sponsored account, click your current tier amount, then click **Cancel sponsorship**. +1. Review the alert about canceling your sponsorship, then click **OK**. + +## Canceling a scheduled sponsorship + +Organizations that pay for {% data variables.product.prodname_sponsors %} by invoice can schedule the first payment for the next billing date. You can cancel the scheduled sponsorship before it becomes active. + +{% data reusables.profile.access_org %} +{% data reusables.profile.org_settings %} +1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and plans**. +1. Under "{% data variables.product.prodname_sponsors %}", in the yellow banner with the start date, click **Undo**. +1. Review the alert about undoing the activation of the sponsorship, then click **OK**. + +For information about _downgrading_ a sponsorship, see [AUTOTITLE](/billing/how-tos/pay-third-parties/downgrade-sponsorship). diff --git a/content/billing/how-tos/pay-third-parties/downgrade-marketplace-app.md b/content/billing/how-tos/pay-third-parties/downgrade-marketplace-app.md index 997c4706ed..95412224c9 100644 --- a/content/billing/how-tos/pay-third-parties/downgrade-marketplace-app.md +++ b/content/billing/how-tos/pay-third-parties/downgrade-marketplace-app.md @@ -24,7 +24,7 @@ contentType: how-tos {% ifversion fpt %}{% data reusables.marketplace.marketplace-app-page %}{% endif %} -When you downgrade an app, your subscription remains active until the end of your current billing cycle. The downgrade takes effect on your next billing date. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace). +**When you downgrade an app, your subscription remains active until the end of your current billing cycle. The downgrade takes effect on your next billing date**. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace). {% data reusables.marketplace.downgrade-marketplace-only %} diff --git a/content/billing/how-tos/pay-third-parties/downgrade-sponsorship.md b/content/billing/how-tos/pay-third-parties/downgrade-sponsorship.md index a81ff10b26..44851ea690 100644 --- a/content/billing/how-tos/pay-third-parties/downgrade-sponsorship.md +++ b/content/billing/how-tos/pay-third-parties/downgrade-sponsorship.md @@ -1,6 +1,6 @@ --- title: Downgrading a sponsorship -intro: You can downgrade your sponsorship to a lower tier or cancel your sponsorship. +intro: You can downgrade your sponsorship to a lower tier. redirect_from: - /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-a-sponsorship - /articles/downgrading-a-sponsorship @@ -12,16 +12,13 @@ versions: ghec: '*' topics: - Billing - - Cancellation - Downgrades - Sponsors shortTitle: Downgrade sponsorship contentType: how-tos --- -## About sponsorship downgrades - -When you downgrade or cancel a sponsorship, the change will become effective on your next billing date. {% data reusables.sponsors.no-refunds %} +**When you downgrade a sponsorship, the change will become effective on your next billing date**. {% data reusables.sponsors.no-refunds %} ## Downgrading a sponsorship @@ -31,20 +28,4 @@ When you downgrade or cancel a sponsorship, the change will become effective on {% data reusables.sponsors.select-a-tier %} {% data reusables.sponsors.update-sponsorship %} -## Canceling a sponsorship - -{% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans %} -{% data reusables.sponsors.billing-switcher %} -1. Under "{% data variables.product.prodname_sponsors %}", next to the sponsored account, click your current tier amount, then click **Cancel sponsorship**. -1. Review the alert about canceling your sponsorship, then click **OK**. - -## Canceling a scheduled sponsorship - -Organizations that pay for {% data variables.product.prodname_sponsors %} by invoice can schedule the first payment for the next billing date. You can cancel the scheduled sponsorship before it becomes active. - -{% data reusables.profile.access_org %} -{% data reusables.profile.org_settings %} -1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and plans**. -1. Under "{% data variables.product.prodname_sponsors %}", in the yellow banner with the start date, click **Undo**. -1. Review the alert about undoing the activation of the sponsorship, then click **OK**. +For information about _canceling_ a sponsorship, see [AUTOTITLE](/billing/how-tos/pay-third-parties/cancel-sponsorship). diff --git a/content/billing/how-tos/pay-third-parties/end-sponsorship.md b/content/billing/how-tos/pay-third-parties/end-sponsorship.md index 5527cad194..d563a866ca 100644 --- a/content/billing/how-tos/pay-third-parties/end-sponsorship.md +++ b/content/billing/how-tos/pay-third-parties/end-sponsorship.md @@ -14,15 +14,14 @@ shortTitle: End sponsorship contentType: how-tos --- -You can set an end date to your sponsorship. The end date assigned will be the last date for which you will be charged for that sponsorship, but the sponsorship will show active for another month. For example, if October 2023 is set as the end date, the last sponsorship will be charged in October 2023, but the sponsorship will be shown as active until November 2023. For more information about setting an end date to a new sponsorship, see [AUTOTITLE](/sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor). +You can set an end date to your sponsorship. The end date assigned will be the last date for which you will be charged for that sponsorship, but the sponsorship will show active for another month. + +For example, if July 2025 is set as the end date, the last sponsorship will be charged in July 2025, but the sponsorship will be shown as active until August 2025. For more information about setting an end date to a new sponsorship, see [AUTOTITLE](/sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor). ## Setting an end date for an existing sponsorship {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.navigate-to-sponsoring %} 1. Next to the sponsorship you want to set an end date for, click **Manage**, and then **Manage sponsorship**. - - ![Screenshot of a sponsorship. The "Manage" dropdown menu is expanded and "Manage sponsorship" is outlined in dark orange.](/assets/images/help/sponsors/manage-sponsorship.png) - {% data reusables.sponsors.setting-an-end-date %} {% data reusables.sponsors.update-sponsorship %} diff --git a/content/billing/how-tos/pay-third-parties/index.md b/content/billing/how-tos/pay-third-parties/index.md index 0d9419e1d3..4bc5f8c993 100644 --- a/content/billing/how-tos/pay-third-parties/index.md +++ b/content/billing/how-tos/pay-third-parties/index.md @@ -22,6 +22,7 @@ children: - /cancel-marketplace-app - /upgrade-sponsorship - /downgrade-sponsorship + - /cancel-sponsorship - /end-sponsorship contentType: how-tos --- diff --git a/content/billing/how-tos/pay-third-parties/upgrade-marketplace-app.md b/content/billing/how-tos/pay-third-parties/upgrade-marketplace-app.md index 5d2823ae7c..a9fbd4b858 100644 --- a/content/billing/how-tos/pay-third-parties/upgrade-marketplace-app.md +++ b/content/billing/how-tos/pay-third-parties/upgrade-marketplace-app.md @@ -24,7 +24,7 @@ contentType: how-tos {% ifversion fpt %}{% data reusables.marketplace.marketplace-app-page %}{% endif %} -When you upgrade an app, your payment method is charged a prorated amount based on the time remaining until your next billing date. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace). +**When you upgrade an app, your payment method is charged a prorated amount based on the time remaining until your next billing date**. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace). ## Upgrading an app for your personal account diff --git a/content/billing/how-tos/pay-third-parties/upgrade-sponsorship.md b/content/billing/how-tos/pay-third-parties/upgrade-sponsorship.md index f977f3bd94..51ad9a3168 100644 --- a/content/billing/how-tos/pay-third-parties/upgrade-sponsorship.md +++ b/content/billing/how-tos/pay-third-parties/upgrade-sponsorship.md @@ -18,9 +18,9 @@ shortTitle: Upgrade sponsorship contentType: how-tos --- -## About sponsorship upgrades +**When you upgrade your sponsorship tier, the change will become effective immediately**. -When you upgrade your sponsorship tier, the change will become effective immediately. {% data reusables.sponsors.prorated-sponsorship %} +{% data reusables.sponsors.prorated-sponsorship %} ## Upgrading a sponsorship From c1811855fd5417dbec2a44e9dc08edbc228a6c0b Mon Sep 17 00:00:00 2001 From: Pantelis <85220850+Pantelis-Santorinios@users.noreply.github.com> Date: Fri, 8 Aug 2025 16:36:50 +0200 Subject: [PATCH 2/3] Update job queue assignment details for larger runners (#56988) Co-authored-by: Larissa Fortuna <56982181+lkfortuna@users.noreply.github.com> Co-authored-by: Sarita Iyer <66540150+saritai@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../actions/larger-runners-troubleshooting-linux-windows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/actions/larger-runners-troubleshooting-linux-windows.md b/data/reusables/actions/larger-runners-troubleshooting-linux-windows.md index 6a30cef466..e8dd35f83d 100644 --- a/data/reusables/actions/larger-runners-troubleshooting-linux-windows.md +++ b/data/reusables/actions/larger-runners-troubleshooting-linux-windows.md @@ -5,4 +5,4 @@ If you notice the jobs that target your {% data variables.actions.hosted_runner * **Billing information:** You must have a valid credit card on file in order to use {% data variables.actions.hosted_runner %}s. After adding a credit card to your account, it can take up to 10 minutes to enable the use of your {% data variables.actions.hosted_runner %}s. For more information, see [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information). * **Spending limit:** Your {% data variables.product.prodname_actions %} spending limit must be set to a value greater than zero. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions). * **Fair use policy:** {% data variables.product.company_short %} has a fair use policy that begins to throttle jobs based on several factors, such as how many jobs you are running or how many jobs are running across the entirety of {% data variables.product.prodname_actions %}. -* **Job queue to assign time:** Job queue to assign time refers to the time between a job request and {% data variables.product.company_short %} assigning a VM to execute the job. Standard {% data variables.product.company_short %}-hosted runners utilizing prescribed YAML workflow labels (such as `ubuntu-latest`) are always in a "warm" state. With larger runners, a warm machine may not be ready to pick up a job on first request as the pools for these machines are smaller. As a result, {% data variables.product.company_short %} may need to create a new VM, which increases the queue to assign time. Once a runner is in use, VMs are readily for subsequent workflow runs, reducing the queue to assign time for future workflow runs over the next 24 hours. +* **Job queue to assign time:** Job queue to assign time refers to the time between a job request and {% data variables.product.company_short %} assigning a VM to execute the job. Standard {% data variables.product.company_short %}-hosted runners utilizing prescribed YAML workflow labels (such as `ubuntu-latest`) are always in a "warm" state. With larger runners, a warm VM may not be ready to pick up a job on first request as the pools for these machines are smaller. As a result, {% data variables.product.company_short %} may need to create a new VM, which increases the queue to assign time. Once a runner is in use, VMs are ready for subsequent workflow runs within 5 minutes. If not used again within that time, a subset of those machines remains warm, reducing the queue to assign time for future workflow runs over the next 24 hours. The higher the volume of jobs you run, the more VMs will remain in the warm pool. From d071940db0c998a817c5af554693599d87c70a7f Mon Sep 17 00:00:00 2001 From: Cory Calahan Date: Fri, 8 Aug 2025 07:37:58 -0700 Subject: [PATCH 3/3] Clarify Helm charts may be requested for troubleshooting purposes (#57035) --- content/actions/concepts/runners/support-for-arc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/concepts/runners/support-for-arc.md b/content/actions/concepts/runners/support-for-arc.md index 55106b55ec..22c83b0199 100644 --- a/content/actions/concepts/runners/support-for-arc.md +++ b/content/actions/concepts/runners/support-for-arc.md @@ -49,4 +49,4 @@ For more information about contacting {% data variables.contact.github_support % ## Working with {% data variables.contact.github_support %} for Actions Runner Controller -{% data variables.contact.github_support %} may ask questions about your Actions Runner Controller deployment and request that you collect and attach the [controller, listener](/actions/hosting-your-own-runners/managing-self-hosted-runners-with-actions-runner-controller/troubleshooting-actions-runner-controller-errors#checking-the-logs-of-the-controller-and-runner-set-listener), and runner logs to the support ticket. +{% data variables.contact.github_support %} may ask questions about your Actions Runner Controller deployment and request that you collect and attach [controller logs, listener logs](/actions/hosting-your-own-runners/managing-self-hosted-runners-with-actions-runner-controller/troubleshooting-actions-runner-controller-errors#checking-the-logs-of-the-controller-and-runner-set-listener), runner logs, and Helm charts (`values.yaml`) to the support ticket.