Skip to content

Commit 7e3cca3

Browse files
authored
Merge pull request #36178 from github/repo-sync
Repo sync
2 parents 773ca41 + 92e54b7 commit 7e3cca3

File tree

8 files changed

+50
-13
lines changed

8 files changed

+50
-13
lines changed

content/billing/using-the-new-billing-platform/about-the-billing-cycle.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ topics:
1212
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
1313
---
1414

15-
>[!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 %}
15+
>[!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 %}
1616
>
1717
> 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).
1818

content/billing/using-the-new-billing-platform/about-the-new-billing-platform.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The enhanced billing platform provides better spending control and detailed usag
2020

2121
The products shown in the enhanced billing platform are determined by your {% data variables.product.github %} plan and subscriptions.
2222

23-
### {% data variables.product.prodname_team %}
23+
### Organizations on {% data variables.product.prodname_team %} or {% data variables.product.prodname_free_team %}
2424

2525
* {% data variables.product.prodname_actions %}
2626
* {% data variables.product.prodname_github_codespaces %}

content/billing/using-the-new-billing-platform/adding-licenses-to-your-account.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ shortTitle: Add licenses to your account
1919
>[!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.
2020
{% endif %}
2121

22-
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).
22+
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)
2323

2424
{% ifversion fpt %}
2525
{% data reusables.profile.access_org %}

content/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@ shortTitle: Get started
1616
If you don't already have access to the enhanced billing platform, you may be able to get started.
1717

1818
{% ifversion fpt %}
19-
* 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.
19+
* 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.
2020
{% endif %}
2121
* 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).
2222
{% ifversion ghec %}
2323
* If you have an **existing** enterprise account and pay by **invoice**, contact your account manager in {% data variables.contact.contact_enterprise_sales %} to discuss switching when your contract renews.
2424
* If you have an **existing** enterprise account and pay via **credit card or PayPal**, wait for an in-product prompt to transition.
2525
{% endif %}
2626

27+
{% ifversion fpt %}
28+
For a comparison of plans, see the {% data variables.product.pricing_link %} page.
29+
{% endif %}
30+
2731
## Next steps
2832

2933
* To **learn about billing cycles**, see [AUTOTITLE](/billing/using-the-new-billing-platform/about-the-billing-cycle).

content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks.md

+29-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ You can navigate between the checks summaries for various commits in a pull requ
5353

5454
![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)
5555

56-
### Skipping and requesting checks for individual commits
56+
## Skipping and requesting checks for individual commits
5757

5858
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).
5959

@@ -81,6 +81,33 @@ Alternatively, to skip or request _all_ checks for your commit, add one of the f
8181

8282
{% data reusables.commits.about-commit-cleanup %}
8383

84-
### Retention of checks
84+
## Check statuses and conclusions
85+
86+
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.
87+
88+
| Status | Description | {% data variables.product.prodname_actions %} only? |
89+
| --- | --- | --- |
90+
| `completed` | The check run completed and has a conclusion (see below). | No |
91+
| `expected` | The check run is waiting for a status to be reported. | Yes |
92+
| `failure` | The check run failed. | No |
93+
| `in_progress` | The check run is in progress. | No |
94+
| `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 |
95+
| `queued` | The check run has been queued. | No |
96+
| `requested` | The check run has been created but has not been queued. | Yes |
97+
| `startup_failure` | The check suite failed during startup. This status is not applicable to check runs. | Yes |
98+
| `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 |
99+
100+
| Conclusion | Description |
101+
| --- | --- |
102+
| `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). |
103+
| `cancelled` | The check run was cancelled before it completed. |
104+
| `failure` | The check run failed. |
105+
| `neutral` | The check run completed with a neutral result. This is treated as a success for dependent checks in {% data variables.product.prodname_actions %}. |
106+
| `skipped` | The check run was skipped. This is treated as a success for dependent checks in {% data variables.product.prodname_actions %}. |
107+
| `stale` | The check run was marked stale by {% data variables.product.github %} because it took too long. |
108+
| `success` | The check run completed successfully. |
109+
| `timed_out` | The check run timed out. |
110+
111+
## Retention of checks
85112

86113
{% data reusables.pull_requests.retention-checks-data %}

content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ remote: error: Required status check "ci-build" is failing
3636
3737
## Required check needs to succeed against the latest commit SHA
3838

39-
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.
39+
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).
4040

4141
## Conflicts between head commit and test merge commit
4242

content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ For complex pull requests that require many reviews, requiring an approval from
9595

9696
### Require status checks before merging
9797

98-
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).
98+
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).
9999

100100
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).
101101

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
{% ifversion fpt %}
22

3-
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:
3+
Outside of {% data variables.product.prodname_ghe_cloud %}, the enhanced billing platform is **only** available to:
4+
* Organization accounts on a {% data variables.product.prodname_team %} plan created after November 13, 2024.
5+
* Organization accounts on a {% data variables.product.prodname_free_team %} plan created after February 4, 2025.
46

5-
* {% data variables.product.prodname_free_user %}
6-
* {% data variables.product.prodname_pro %}
7-
* Organizations that upgrade from {% data variables.product.prodname_free_user %} to {% data variables.product.prodname_team %}
7+
</br>It is currently **not** available to user accounts on any plan.</br>
8+
9+
<!-- expires 2025-04-30 -->
10+
11+
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.
12+
13+
<!-- end expires 2025-04-30 -->
814

915
{% elsif ghec %}
1016

@@ -13,6 +19,6 @@ The enhanced billing platform is available to:
1319
* All enterprise accounts, and their organizations, created after June 2, 2024
1420
* Enterprises that participated in the {% data variables.release-phases.public_preview %} program
1521

16-
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/).
22+
</br>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/).
1723

1824
{% endif %}

0 commit comments

Comments
 (0)