Skip to content

Commit 57afdb4

Browse files
authored
Merge pull request #42316 from github/repo-sync
Repo sync
2 parents 858081d + 253d67b commit 57afdb4

File tree

189 files changed

+2747
-1678
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+2747
-1678
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,7 @@ jobs:
163163
ENABLED_LANGUAGES: ${{ matrix.name == 'languages' && 'all' || '' }}
164164
ROOT: ${{ (matrix.name == 'fixtures' || matrix.name == 'article-api' || matrix.name == 'landings' ) && 'src/fixtures/fixtures' || '' }}
165165
TRANSLATIONS_FIXTURE_ROOT: ${{ (matrix.name == 'fixtures' || matrix.name == 'article-api') && 'src/fixtures/fixtures/translations' || '' }}
166+
# Enable debug logging when "Re-run jobs with debug logging" is used in GitHub Actions UI
167+
# This will output additional timing and path information to help diagnose timeout issues
168+
RUNNER_DEBUG: ${{ runner.debug }}
166169
run: npm test -- src/${{ matrix.name }}/tests/

content/admin/managing-code-security/managing-supply-chain-security-for-your-enterprise/index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
---
22
title: Managing supply chain security for your enterprise
33
shortTitle: Supply chain security
4-
intro: 'You can visualize, maintain, and secure the dependencies in your developers'' software supply chain.'
4+
intro: You can visualize, maintain, and secure the dependencies in your developers' software supply chain.
55
versions:
66
ghes: '*'
77
topics:
88
- Enterprise
99
children:
10-
- /about-supply-chain-security-for-your-enterprise
1110
- /enabling-the-dependency-graph-for-your-enterprise
1211
- /viewing-the-vulnerability-data-for-your-enterprise
1312
- /configuring-dependabot-to-work-with-limited-internet-access

content/admin/managing-code-security/securing-your-enterprise/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ topics:
1212
- Dependabot
1313
- Repositories
1414
children:
15-
- /about-security-configurations
1615
- /applying-the-github-recommended-security-configuration-to-your-enterprise
1716
- /creating-a-custom-security-configuration-for-your-enterprise
1817
- /applying-a-custom-security-configuration-to-your-enterprise
1918
- /configuring-additional-secret-scanning-settings-for-your-enterprise
2019
- /editing-a-custom-security-configuration
2120
- /deleting-a-custom-security-configuration
2221
---
22+

content/admin/managing-iam/provisioning-user-accounts-with-scim/user-provisioning-with-scim-on-ghes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ The following IdPs are partner IdPs. They offer an application that you can use
4545

4646
When you use a single partner IdP for both authentication and provisioning, {% data variables.product.company_short %} provides support for the application on the partner IdP and the IdP's integration with {% data variables.product.prodname_dotcom %}. Support for PingFederate is in {% data variables.release-phases.public_preview %}.
4747

48+
We do not have a supported partner application when using Entra ID for Azure Government.
49+
4850
### Other identity management systems
4951

5052
If you cannot use a single partner IdP for both authentication and provisioning, you can use another identity management system or combination of systems. The system must:

content/admin/managing-iam/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ For more information about connecting Microsoft Entra ID (previously known as Az
7373

7474
For more information about connecting Entra ID to your enterprise, see [Tutorial: Microsoft Entra SSO integration with GitHub Enterprise Server](https://learn.microsoft.com/en-us/entra/identity/saas-apps/github-ae-tutorial) in Microsoft Docs.
7575

76+
We do not have a supported partner application when using Entra ID for Azure Government.
77+
7678
## Username considerations with SAML
7779

7880
{% data reusables.enterprise_user_management.consider-usernames-for-external-authentication %} For more information, see [AUTOTITLE](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication).

content/billing/reference/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ children:
2323
- /product-usage-included
2424
- /roles-for-visual-studio
2525
- /supported-payment-methods
26+
- /previous-billing-platform-endpoints
2627
contentType: reference
2728
---
28-
Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
---
2+
title: Migrating from the endpoints used for the previous billing platform
3+
shortTitle: Previous billing platform endpoints
4+
intro: 'If your organization previously used the billing platform that predated metered billing, this article explains how to migrate existing usage reporting to the current billing usage endpoints.'
5+
versions:
6+
fpt: '*'
7+
ghec: '*'
8+
topics:
9+
- Enterprise
10+
- Billing
11+
- REST
12+
permissions: 'Enterprise owners, organization owners, and billing managers'
13+
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
14+
contentType: reference
15+
---
16+
17+
<!-- expires 2026-01-15 -->
18+
<!-- To check on whether this can be deleted or not, see the PM in ref: 6591 -->
19+
20+
After you transition to metered billing, the endpoints you used to get data from the previous billing platform will no longer return accurate usage information.
21+
22+
You will need to upgrade all calls using the previous `/ACCOUNT-TYPE/NAME/settings/billing/PRODUCT` REST API endpoints to use the equivalent `/ACCOUNT-TYPE/NAME/settings/billing/usage` endpoint.
23+
24+
## Changes in authentication
25+
26+
If you used a {% data variables.product.pat_v2 %} to authenticate with the previous endpoints, you will need create a {% data variables.product.pat_v1 %} to authenticate with the new endpoint.
27+
28+
In addition, you may want to use the new query parameters to specify a time period or cost center.
29+
30+
## Calculating {% data variables.product.prodname_actions %} information from the new response data
31+
32+
Example of the previous response
33+
34+
```json
35+
{"total_minutes_used": 305, "total_paid_minutes_used": 0, "included_minutes": 3000, "minutes_used_breakdown": { "UBUNTU": 205, "MACOS": 10, "WINDOWS": 90 } }
36+
```
37+
38+
Example of the new response
39+
40+
```json
41+
{ "usageItems": [ { "date": "2023-08-01", "product": "Actions", "sku": "Actions Linux", "quantity": 100, "unitType": "minutes", "pricePerUnit": 0.008, "grossAmount": 0.8, "discountAmount": 0, "netAmount": 0.8, "organizationName": "GitHub", "repositoryName": "github/example"} ] }
42+
```
43+
44+
To get the same values from the new response data:
45+
46+
{% rowheaders %}
47+
48+
| Previous property | Calculate from new API response |
49+
|------ |----------- |
50+
| `total_minutes_used` | <ol><li> Filter results by `"product": "Actions"` and `"unitType": "minutes"`</li><li>Sum `quantity`</li></ol>|
51+
| `total_paid_minutes_used`| This is now represented as a $ amount via `netAmount`.<ol><li>Filter results by `"product": "Actions"` and `"unitType": "minutes"`</li><li>Sum `netAmount`</li></ol>|
52+
| `included_minutes` | This is now represented as a $ amount via `discountAmount`.<ol><li>Filter results by `"product": "Actions"` and `"unitType": "minutes"`</li><li>Sum `discountAmount`</li></ol>|
53+
| `minutes_used_breakdown` | <ol><li>Filter results by `"product": "Actions"` and `"unitType": "minutes"`</li><li>Sum `quantity` grouped by `sku`</li></ol>|
54+
55+
{% endrowheaders %}
56+
57+
## Calculating {% data variables.product.prodname_registry %} information from the new response data
58+
59+
Example of the previous response
60+
61+
```json
62+
{ "total_gigabytes_bandwidth_used": 50, "total_paid_gigabytes_bandwidth_used": 40, "included_gigabytes_bandwidth": 10 }
63+
```
64+
65+
Example of the new response
66+
67+
```json
68+
{ "usageItems": [ { "date": "2023-08-01", "product": "Packages", "sku": "Packages data transfer", "quantity": 100, "unitType": "gigabytes", "pricePerUnit": 0.008, "grossAmount": 0.8, "discountAmount": 0, "netAmount": 0.8, "organizationName": "GitHub", "repositoryName": "github/example" } ] }
69+
```
70+
71+
{% rowheaders %}
72+
73+
| Previous property | Calculate from new API response |
74+
|------ |----------- |
75+
| `total_gigabytes_bandwidth_used` | <ol><li>Filter results by `"product": "Packages"` and `"unitType": "gigabytes"` </li><li>Sum `quantity`</li></ol> |
76+
| `total_paid_gigabytes_bandwidth_used`| This is now represented as a $ amount via `netAmount`. <ol><li>Filter results by `"product": "Packages"` and `"unitType": "gigabytes"`</li><li>Sum `netAmount`</li></ol> |
77+
| `included_gigabytes_bandwidth` | This is now represented as a $ amount via `discountAmount`.<ol><li>Filter results by `"product": "Packages"` and `"unitType": "gigabytes"`</li><li>Sum `discountAmount`</li></ol> |
78+
79+
{% endrowheaders %}
80+
81+
## Calculating shared storage information from the new response data
82+
83+
Example of the previous response
84+
85+
```json
86+
{ "days_left_in_billing_cycle": 20, "estimated_paid_storage_for_month": 15, "estimated_storage_for_month": 40 }
87+
```
88+
89+
Example of the new response
90+
91+
```json
92+
{ "usageItems": [ { "date": "2023-08-01", "product": "Packages", "sku": "Packages storage", "quantity": 100, "unitType": "GigabyteHours", "pricePerUnit": 0.008, "grossAmount": 0.8, "discountAmount": 0, "netAmount": 0.8, "organizationName": "GitHub", "repositoryName": "github/example" } ] }
93+
```
94+
95+
{% rowheaders %}
96+
97+
| Previous property | Calculate from new API response |
98+
|------ |----------- |
99+
| `days_left_in_billing_cycle` | Not available. This information can be inferred by subtracting the current day of the month from the number of days in the current month. |
100+
| `estimated_paid_storage_for_month`| This is now represented as a $ amount via `netAmount`. <br><br> Prerequisite: pass the `month` and `year` query parameters. <br><br> <i> For Actions storage </i> <ol><li> Filter results by `"product": "Actions"` and `"unitType": "GigabyteHours"`</li><li> Sum `netAmount`</li></ol> <i> For Packages storage </i> <ol><li> Filter results by `"product": "Packages"` and `"unitType": "GigabyteHours"`</li><li> Sum `netAmount`</li></ol>|
101+
| `estimated_storage_for_month` | Prerequisite: pass the `month` and `year` query parameters. <br><br> <i> For Actions storage </i> <ol><li> Filter results by `"product": "Actions"` and `"unitType": "GigabyteHours"`</li><li> Sum `quantity`</li></ol> <i> For Packages storage </i> <ol><li> Filter results by `"product": "Packages"` and `"unitType": "GigabyteHours"`</li><li> Sum `quantity`</li></ol>|
102+
103+
{% endrowheaders %}
104+
105+
<!-- end expires 2026-01-15 -->

0 commit comments

Comments
 (0)