Skip to content

Commit 27a5202

Browse files
authored
Merge pull request #39642 from github/repo-sync
Repo sync
2 parents cc3b51f + 26ab383 commit 27a5202

File tree

18 files changed

+288
-30
lines changed

18 files changed

+288
-30
lines changed

content/actions/reference/workflows-and-actions/events-that-trigger-workflows.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ on:
5656

5757
{% data reusables.actions.branch-requirement %}
5858

59+
> [!NOTE]
60+
> To prevent recursive workflows, this event does not trigger workflows if the check run's check suite was created by {% data variables.product.prodname_actions %} or if the check suite's head SHA is associated with {% data variables.product.prodname_actions %}.
61+
5962
Runs your workflow when activity related to a check run occurs. A check run is an individual test that is part of a check suite. For information, see [AUTOTITLE](/rest/guides/using-the-rest-api-to-interact-with-checks). For information about the check run APIs, see [AUTOTITLE](/graphql/reference/objects#checkrun) in the GraphQL API documentation or [AUTOTITLE](/rest/checks/runs).
6063

6164
For example, you can run a workflow when a check run has been `rerequested` or `completed`.
@@ -78,7 +81,7 @@ on:
7881
{% data reusables.actions.branch-requirement %}
7982

8083
> [!NOTE]
81-
> To prevent recursive workflows, this event does not trigger workflows if the check suite was created by {% data variables.product.prodname_actions %}.
84+
> To prevent recursive workflows, this event does not trigger workflows if the check suite was created by {% data variables.product.prodname_actions %} or if the check suite's head SHA is associated with {% data variables.product.prodname_actions %}.
8285

8386
Runs your workflow when check suite activity occurs. A check suite is a collection of the check runs created for a specific commit. Check suites summarize the status and conclusion of the check runs that are in the suite. For information, see [AUTOTITLE](/rest/guides/using-the-rest-api-to-interact-with-checks). For information about the check suite APIs, see [AUTOTITLE](/graphql/reference/objects#checksuite) in the GraphQL API documentation or [AUTOTITLE](/rest/checks/suites).
8487

content/billing/concepts/product-billing/git-lfs.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ In this example, {% data variables.product.company_short %} would bill for 1.5 G
7070

7171
{% data reusables.billing.default-over-quota-behavior %}
7272

73+
{% data reusables.billing.migrated-budgets %}
74+
7375
## Further reading
7476

7577
* [AUTOTITLE](/repositories/working-with-files/managing-large-files/about-git-large-file-storage)

content/billing/concepts/product-billing/github-actions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,3 +162,5 @@ Your {% data variables.product.prodname_actions %} usage shares your account's e
162162
## Managing your budget for {% data variables.product.prodname_actions %}
163163

164164
{% data reusables.billing.default-over-quota-behavior %}
165+
166+
{% data reusables.billing.migrated-budgets %}

content/billing/concepts/product-billing/github-codespaces.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ You can view details of your usage for the current month at any time. See [AUTOT
8181

8282
If you are blocked from resuming a codespace and you want to continue to work on changes you have made in your codespace, you can do any of the following:
8383

84-
* Add a payment method and set a budget greater than $0 USD.
84+
* Add a payment method and review your budget settings to ensure they meet your usage needs. See [AUTOTITLE](/billing/tutorials/set-up-budgets#viewing-budgets).
8585
* Export the changes from the codespace to a branch. See [AUTOTITLE](/codespaces/troubleshooting/exporting-changes-to-a-branch).
8686
* Wait for your monthly included usage to reset at the start of the next monthly billing cycle.
8787

@@ -204,6 +204,8 @@ Use of codespaces created using prebuilds is charged at the same rate as regular
204204

205205
{% data reusables.billing.default-over-quota-behavior %}
206206

207+
{% data reusables.billing.migrated-budgets %}
208+
207209
{% data reusables.codespaces.exporting-changes %}
208210

209211
## Viewing projected usage for an organization

content/billing/concepts/product-billing/github-models.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ For accounts that use a custom model with a third-party model provider, billing
6565

6666
Enterprises and organizations can opt in to paid usage to access expanded model capabilities, including increased request allowances and larger context windows. You can manage their spending by setting a budget.
6767

68-
By default, organizations and personal accounts that opt in to paid usage have a spending limit of $0 US dollars (USD) until the budget is increased.
68+
Organizations and personal accounts may have default budgets to limit spending. Check the budgets for your account to ensure they are appropriate for your usage needs. See [AUTOTITLE](/billing/tutorials/set-up-budgets#viewing-budgets).
69+
70+
{% data reusables.billing.migrated-budgets %}
6971

7072
For more information, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending).
7173

@@ -105,24 +107,24 @@ The following table displays how the total cost is calculated for a request usin
105107

106108
The following steps demonstrate how the total cost is calculated:
107109

108-
1. **Calculate input tokens:**
109-
Multiply the number of input tokens by the input multiplier.
110+
1. **Calculate input tokens:**
111+
Multiply the number of input tokens by the input multiplier.
110112
`1,000,000 tokens × 0.25 = 250,000 input token units`
111113

112-
1. **Calculate billable output tokens:**
113-
Multiply the number of output tokens by the output multiplier.
114+
1. **Calculate billable output tokens:**
115+
Multiply the number of output tokens by the output multiplier.
114116
`1,000,000 tokens × 1 = 1,000,000 output token units`
115117

116-
1. **Add billable tokens:**
117-
Add the billable input and output tokens.
118+
1. **Add billable tokens:**
119+
Add the billable input and output tokens.
118120
`250,000 (input) + 1,000,000 (output) = 1,250,000 total token units`
119121

120-
1. **Charges by type:**
121-
* **Input charge:** `250,000 × $0.00001 = $2.50`
122+
1. **Charges by type:**
123+
* **Input charge:** `250,000 × $0.00001 = $2.50`
122124
* **Output charge:** `1,000,000 × $0.00001 = $10.00`
123125

124-
1. **Calculate the total cost:**
125-
Multiply the total token units by the token unit price.
126+
1. **Calculate the total cost:**
127+
Multiply the total token units by the token unit price.
126128
`1,250,000 × $0.00001 = $12.50 for this request`
127129

128130
## Opting out of paid usage

content/billing/concepts/product-billing/github-packages.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,5 @@ Your {% data variables.product.prodname_registry %} usage shares your account's
9191
## Managing your budget for {% data variables.product.prodname_registry %}
9292

9393
{% data reusables.billing.default-over-quota-behavior %}
94+
95+
{% data reusables.billing.migrated-budgets %}

content/billing/tutorials/set-up-budgets.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ Budgets and alerts allow you to track spending on metered products for your acco
3434

3535
If your account does not have a valid payment method on file, usage is blocked once you use up your quota.
3636

37-
By default, if you have a valid payment method on file, spending is limited to $0 USD until you set a budget. You can set and manage a budget to limit spending for a product or SKU.
37+
If you have a valid payment method on file, spending may be limited by one or more budgets. Check the budgets set for your account to ensure they are appropriate for your usage needs.
3838

39-
<!--Billing: default budget-->
39+
{% data reusables.billing.migrated-budgets %}
4040

4141
## About budgets
4242

@@ -126,7 +126,7 @@ As the owner of an enterprise or organization account, or as a billing manager,
126126

127127
### Editing or deleting a budget
128128

129-
>[!IMPORTANT] Deleting a budget may remove any limits on spending, depending on your other existing budgets. For example, deleting the default $0 budget for {% data variables.product.prodname_copilot_short %} premium requests allows for unlimited usage.
129+
>[!IMPORTANT] Deleting a budget may remove any limits on spending, depending on your other existing budgets. For example, deleting the only budget that limits {% data variables.product.prodname_copilot_short %} premium requests allows for unlimited usage.
130130
131131
You can edit or delete a budget at any time, but you cannot change the scope of a budget after creating it.
132132

content/code-security/secret-scanning/working-with-secret-scanning-and-push-protection/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ topics:
1313
- Secret Protection
1414
- Repositories
1515
children:
16+
- /remediating-a-leaked-secret
1617
- /push-protection-for-users
1718
- /working-with-push-protection-from-the-command-line
1819
- /working-with-push-protection-from-the-rest-api

0 commit comments

Comments
 (0)