diff --git a/content/billing/using-the-new-billing-platform/about-the-billing-cycle.md b/content/billing/using-the-new-billing-platform/about-the-billing-cycle.md index b425d14d66e3..b9cc0c527d56 100644 --- a/content/billing/using-the-new-billing-platform/about-the-billing-cycle.md +++ b/content/billing/using-the-new-billing-platform/about-the-billing-cycle.md @@ -12,7 +12,7 @@ topics: product: '{% data reusables.billing.enhanced-billing-platform-product %}' --- ->[!IMPORTANT] {% ifversion fpt %}If you have a {% data variables.product.prodname_free_user %} plan or a {% data variables.product.prodname_pro %} plan, this article does not apply to you.{% elsif ghec %}If you have not migrated to the enhanced billing platform, this article does not apply to you.{% endif %} +>[!IMPORTANT] {% ifversion fpt %}If you want to know about billing for your personal user account, this article does not apply to you.{% elsif ghec %}If you have not migrated to the enhanced billing platform, this article does not apply to you.{% endif %} > > To check if you are on the enhanced billing platform, see [How do I know if I can access the enhanced billing platform?](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-enhanced-billing-platform). diff --git a/content/billing/using-the-new-billing-platform/about-the-new-billing-platform.md b/content/billing/using-the-new-billing-platform/about-the-new-billing-platform.md index 31ee6f9546ce..e67aa4cc981d 100644 --- a/content/billing/using-the-new-billing-platform/about-the-new-billing-platform.md +++ b/content/billing/using-the-new-billing-platform/about-the-new-billing-platform.md @@ -20,7 +20,7 @@ The enhanced billing platform provides better spending control and detailed usag The products shown in the enhanced billing platform are determined by your {% data variables.product.github %} plan and subscriptions. -### {% data variables.product.prodname_team %} +### Organizations on {% data variables.product.prodname_team %} or {% data variables.product.prodname_free_team %} * {% data variables.product.prodname_actions %} * {% data variables.product.prodname_github_codespaces %} diff --git a/content/billing/using-the-new-billing-platform/adding-licenses-to-your-account.md b/content/billing/using-the-new-billing-platform/adding-licenses-to-your-account.md index a943628be638..af0491b528c9 100644 --- a/content/billing/using-the-new-billing-platform/adding-licenses-to-your-account.md +++ b/content/billing/using-the-new-billing-platform/adding-licenses-to-your-account.md @@ -19,7 +19,7 @@ shortTitle: Add licenses to your account >[!IMPORTANT] If you pay by invoice, you need to contact your account manager in {% data variables.contact.contact_enterprise_sales %} to add licenses to your enterprise account. {% endif %} -If you have access to the new billing platform, you can add {% ifversion enterprise-licensing-language %}licenses{% else %}seats{% endif %} to your account through the "Licensing" page. To check if you have access, see [AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-new-billing-platform). +If you have access to the new billing platform{% ifversion fpt %} with an organization on a {% data variables.product.prodname_team %} plan{% endif %}, you can add {% ifversion enterprise-licensing-language %}licenses{% else %}seats{% endif %} to your account through the "Licensing" page. To check if you have access, see [AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-new-billing-platform) {% ifversion fpt %} {% data reusables.profile.access_org %} diff --git a/content/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md b/content/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md index dd3a232c1455..5d5c5a04d2b5 100644 --- a/content/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md +++ b/content/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md @@ -16,7 +16,7 @@ shortTitle: Get started If you don't already have access to the enhanced billing platform, you may be able to get started. {% ifversion fpt %} -* If you are **new** to {% data variables.product.github %}, set up a {% data variables.product.prodname_team %} plan account. See [Team](https://github.com/pricing) on the {% data variables.product.github %} pricing page. +* If you are **new** to {% data variables.product.github %}, create an organization on a {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %} plan. {% endif %} * If you are **new** to {% data variables.product.prodname_ghe_cloud %}, set up a trial of {% data variables.product.prodname_ghe_cloud %}. See [AUTOTITLE](/admin/overview/setting-up-a-trial-of-github-enterprise-cloud). {% ifversion ghec %} @@ -24,6 +24,10 @@ If you don't already have access to the enhanced billing platform, you may be ab * If you have an **existing** enterprise account and pay via **credit card or PayPal**, wait for an in-product prompt to transition. {% endif %} +{% ifversion fpt %} +For a comparison of plans, see the {% data variables.product.pricing_link %} page. +{% endif %} + ## Next steps * To **learn about billing cycles**, see [AUTOTITLE](/billing/using-the-new-billing-platform/about-the-billing-cycle). diff --git a/content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks.md b/content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks.md index c297ebfd1ae1..01d58808a2f4 100644 --- a/content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks.md +++ b/content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks.md @@ -53,7 +53,7 @@ You can navigate between the checks summaries for various commits in a pull requ ![Screenshot of the "Checks" tab of a pull request. The "Checks" tab and the dropdown menu to select a commit are both outlined in dark orange.](/assets/images/help/pull_requests/checks-summary-for-various-commits.png) -### Skipping and requesting checks for individual commits +## Skipping and requesting checks for individual commits When a repository is set to automatically request checks for pushes, you can choose to skip checks for an individual commit you push. When a repository is _not_ set to automatically request checks for pushes, you can request checks for an individual commit you push. For more information on these settings, see [AUTOTITLE](/rest/checks/suites#update-repository-preferences-for-check-suites). @@ -81,6 +81,33 @@ Alternatively, to skip or request _all_ checks for your commit, add one of the f {% data reusables.commits.about-commit-cleanup %} -### Retention of checks +## Check statuses and conclusions + +Checks can have many different statuses. Statuses describe the state of a check from when it is created to when it is completed. Some statuses cannot be set manually and are reserved for {% data variables.product.prodname_actions %}. When a check has a status of `completed`, it has a conclusion. The conclusion describes the result of the check. All possible check statuses and conclusions are listed below. + +| Status | Description | {% data variables.product.prodname_actions %} only? | +| --- | --- | --- | +| `completed` | The check run completed and has a conclusion (see below). | No | +| `expected` | The check run is waiting for a status to be reported. | Yes | +| `failure` | The check run failed. | No | +| `in_progress` | The check run is in progress. | No | +| `pending` | The check run is at the front of the queue but the [group-based concurrency](/actions/writing-workflows/choosing-what-your-workflow-does/control-the-concurrency-of-workflows-and-jobs) limit has been reached. | Yes | +| `queued` | The check run has been queued. | No | +| `requested` | The check run has been created but has not been queued. | Yes | +| `startup_failure` | The check suite failed during startup. This status is not applicable to check runs. | Yes | +| `waiting` | The check run is waiting for a [deployment protection rule](/actions/managing-workflow-runs-and-deployments/managing-deployments/managing-environments-for-deployment#deployment-protection-rules) to be satisfied. | Yes | + +| Conclusion | Description | +| --- | --- | +| `action_required` | The check run provided required actions upon its completion. For more information, see [AUTOTITLE](/rest/guides/using-the-rest-api-to-interact-with-checks#check-runs-and-requested-actions). | +| `cancelled` | The check run was cancelled before it completed. | +| `failure` | The check run failed. | +| `neutral` | The check run completed with a neutral result. This is treated as a success for dependent checks in {% data variables.product.prodname_actions %}. | +| `skipped` | The check run was skipped. This is treated as a success for dependent checks in {% data variables.product.prodname_actions %}. | +| `stale` | The check run was marked stale by {% data variables.product.github %} because it took too long. | +| `success` | The check run completed successfully. | +| `timed_out` | The check run timed out. | + +## Retention of checks {% data reusables.pull_requests.retention-checks-data %} diff --git a/content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks.md b/content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks.md index 54a5c03cc826..165ab9714890 100644 --- a/content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks.md +++ b/content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks.md @@ -36,7 +36,7 @@ remote: error: Required status check "ci-build" is failing ## Required check needs to succeed against the latest commit SHA -In order for a pull request to be merged, all required checks must pass against the latest commit SHA. This ensures that the most recent changes are validated and meet the required standards before merging. Checks that were triggered using a previous commit SHA will not be used as part of required checks. +In order for a pull request to be merged, all required checks must pass against the latest commit SHA. This ensures that the most recent changes are validated and meet the required standards before merging. Checks that were triggered using a previous commit SHA will not be used as part of required checks. Successful check statuses are: `success`, `skipped`, and `neutral`. For more information, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks). ## Conflicts between head commit and test merge commit diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md index af2abeb38f33..f2b4060be93c 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md @@ -95,7 +95,7 @@ For complex pull requests that require many reviews, requiring an approval from ### Require status checks before merging -Required status checks ensure that all required CI tests are either passing or skipped before collaborators can make changes to a protected branch. Required status checks can be checks or statuses. For more information, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks). +Required status checks must have a `successful`, `skipped`, or `neutral` status before collaborators can make changes to a protected branch. Required status checks can be checks or commit statuses. For more information, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks). You can use the commit status API to allow external services to mark commits with an appropriate status. For more information, see [AUTOTITLE](/rest/commits/statuses). diff --git a/data/reusables/billing/enhanced-billing-platform-product.md b/data/reusables/billing/enhanced-billing-platform-product.md index 5daa30a475ba..a4dfaeb14ea3 100644 --- a/data/reusables/billing/enhanced-billing-platform-product.md +++ b/data/reusables/billing/enhanced-billing-platform-product.md @@ -1,10 +1,16 @@ {% ifversion fpt %} -Outside of {% data variables.product.prodname_ghe_cloud %}, the enhanced billing platform is available only to organization accounts created after November 13, 2024 on a {% data variables.product.prodname_team %} plan. It is currently **not** available to: +Outside of {% data variables.product.prodname_ghe_cloud %}, the enhanced billing platform is **only** available to: +* Organization accounts on a {% data variables.product.prodname_team %} plan created after November 13, 2024. +* Organization accounts on a {% data variables.product.prodname_free_team %} plan created after February 4, 2025. -* {% data variables.product.prodname_free_user %} -* {% data variables.product.prodname_pro %} -* Organizations that upgrade from {% data variables.product.prodname_free_user %} to {% data variables.product.prodname_team %} +
It is currently **not** available to user accounts on any plan.
+ + + +Beginning in February 2025, {% data variables.product.company_short %} will migrate organizations on {% data variables.product.prodname_team %} to the new billing platform. Organizations will receive notice 30 days before their migration. + + {% elsif ghec %} @@ -13,6 +19,6 @@ The enhanced billing platform is available to: * All enterprise accounts, and their organizations, created after June 2, 2024 * Enterprises that participated in the {% data variables.release-phases.public_preview %} program -Beginning in September 2024, {% data variables.product.company_short %} will migrate remaining enterprises to the new billing platform. Enterprises will receive a notice 30 days before their migration. See the [GitHub blog](https://github.blog/changelog/2024-09-24-enhanced-billing-platform-for-enterprises/). +
Beginning in September 2024, {% data variables.product.company_short %} will migrate remaining enterprises to the new billing platform. Enterprises will receive a notice 30 days before their migration. See the [GitHub blog](https://github.blog/changelog/2024-09-24-enhanced-billing-platform-for-enterprises/). {% endif %}