Skip to content

Commit 239f174

Browse files
author
Alexei Juárez
authored
Merge branch 'github:main' into main
2 parents ef342ad + 2dffa8d commit 239f174

File tree

87 files changed

+483
-147
lines changed

Some content is hidden

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

87 files changed

+483
-147
lines changed
Loading
Loading
Loading
Loading

content/actions/migrating-to-github-actions/using-github-actions-importer-to-automate-migrations/extending-github-actions-importer-with-custom-transformers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ gh actions-importer ... --custom-transformers transformers/*.rb
4545

4646
{% note %}
4747

48-
**Note:** When you use custom transformers, the custom transformer files must reside in the same directory, or in subdirectores, from where the `gh actions-importer` command is run.
48+
**Note:** When you use custom transformers, the custom transformer files must reside in the same directory, or in subdirectories, from where the `gh actions-importer` command is run.
4949

5050
{% endnote %}
5151

content/actions/writing-workflows/choosing-what-your-workflow-does/caching-dependencies-to-speed-up-workflows.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,11 @@ Users with `write` access to a repository can use the {% data variables.product.
338338

339339
### Force deleting cache entries
340340

341-
Caches have branch scope restrictions in place, which means some caches have limited usage options. For more information on cache scope restrictions, see "[AUTOTITLE](/actions/using-workflows/caching-dependencies-to-speed-up-workflows#restrictions-for-accessing-a-cache)." If caches limited to a specific branch are using a lot of storage quota, it may cause caches from the `default` branch to be created and deleted at a high frequency.
341+
Caches have branch scope restrictions in place, which means some caches have limited usage options. For more information on cache scope restrictions, see "[Restrictions for accessing a cache](#restrictions-for-accessing-a-cache)," earlier in this article. If caches limited to a specific branch are using a lot of storage quota, it may cause caches from the `default` branch to be created and deleted at a high frequency.
342342

343-
For example, a repository could have many new pull requests opened, each with their own caches that are restricted to that branch. These caches could take up the majority of the cache storage for that repository. {% data reusables.actions.cache-eviction-policy %} In order to prevent cache thrashing when this happens, you can set up workflows to delete caches on a faster cadence than the cache eviction policy will. You can use the [`gh-actions-cache`](https://github.com/actions/gh-actions-cache/) CLI extension to delete caches for specific branches.
343+
For example, a repository could have many new pull requests opened, each with their own caches that are restricted to that branch. These caches could take up the majority of the cache storage for that repository. {% data reusables.actions.cache-eviction-policy %} In order to prevent cache thrashing when this happens, you can set up workflows to delete caches on a faster cadence than the cache eviction policy will. You can use the {% data variables.product.prodname_cli %} to delete caches for specific branches.
344344

345-
The following example workflow uses `gh-actions-cache` to delete up to 100 caches created by a branch once a pull request is closed.
345+
The following example workflow uses `gh cache` to delete up to 100 caches created by a branch once a pull request is closed.
346346

347347
To run the following example on cross-repository pull requests or pull requests from forks, you can trigger the workflow with the `pull_request_target` event. If you do use `pull_request_target` to trigger the workflow, there are security considerations to keep in mind. For more information, see "[AUTOTITLE](/actions/using-workflows/events-that-trigger-workflows#pull_request_target)."
348348

@@ -359,22 +359,20 @@ jobs:
359359
steps:
360360
- name: Cleanup
361361
run: |
362-
gh extension install actions/gh-actions-cache
363-
364362
echo "Fetching list of cache key"
365-
cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 )
363+
cacheKeysForPR=$(gh cache list --ref $BRANCH --limit 100 --json id --jq '.[].id')
366364
367365
## Setting this to not fail the workflow while deleting cache keys.
368366
set +e
369367
echo "Deleting caches..."
370368
for cacheKey in $cacheKeysForPR
371369
do
372-
gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
370+
gh cache delete $cacheKey
373371
done
374372
echo "Done"
375373
env:
376374
GH_TOKEN: {% raw %}${{ secrets.GITHUB_TOKEN }}{% endraw %}
377-
REPO: {% raw %}${{ github.repository }}{% endraw %}
375+
GH_REPO: {% raw %}${{ github.repository }}{% endraw %}
378376
BRANCH: refs/pull/{% raw %}${{ github.event.pull_request.number }}{% endraw %}/merge
379377
```
380378

content/admin/configuring-settings/configuring-github-connect/enabling-github-connect-for-ghecom.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ shortTitle: Enable for GHE.com
44
intro: 'Enable {% data variables.product.prodname_github_connect %} to share data between {% data variables.enterprise.data_residency_site %} and {% data variables.location.product_location %}.'
55
versions:
66
feature: ghecom-github-connect
7+
redirect_from:
8+
- /early-access/admin/preview-of-data-residency-for-github-enterprise/configuring-github-connect-during-the-preview-of-data-residency
9+
- /early-access/admin/private-ga-of-data-residency-for-github-enterprise-cloud/configuring-github-connect-during-the-private-ga-of-data-residency
10+
- /early-access/admin/data-residency-for-github-enterprise-cloud/configuring-github-connect-for-data-residency
711
---
812

913
You can access additional features and workflows on {% data variables.location.product_location %} by enabling {% data variables.product.prodname_github_connect %}. See "[AUTOTITLE](/admin/configuration/configuring-github-connect/about-github-connect)."

content/admin/data-residency/about-github-enterprise-cloud-with-data-residency.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ intro: "With {% data variables.product.prodname_ghe_cloud %}, you can have more
44
shortTitle: What is data residency?
55
versions:
66
ghec: '*'
7+
redirect_from:
8+
- /early-access/admin/using-a-data-local-enterprise-on-github/about-the-alpha-of-data-locality-for-github-enterprise-cloud
9+
- /early-access/admin/using-a-data-local-enterprise-on-github/about-the-alpha-of-data-residency-for-github-enterprise-cloud
10+
- /early-access/admin/preview-of-data-residency-for-github-enterprise/about-the-preview-of-data-residency-for-github-enterprise
11+
- /early-access/admin/private-ga-of-data-residency-for-github-enterprise-cloud/about-the-private-ga-of-data-residency-for-github-enterprise-cloud
12+
- /early-access/admin/data-residency-for-github-enterprise-cloud/about-data-residency-for-github-enterprise-cloud
713
---
814

915
By default, {% data variables.product.company_short %} stores data for {% data variables.product.prodname_dotcom_the_website %} in the USA. {% data reusables.data-residency.when-you-adopt-data-residency %} To learn how {% data variables.product.company_short %} handles data storage, see "[AUTOTITLE](/admin/data-residency/about-storage-of-your-data-with-data-residency)."

content/admin/data-residency/about-storage-of-your-data-with-data-residency.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ shortTitle: How is data stored?
44
intro: "Learn how your data is stored when you use {% data variables.enterprise.data_residency %}."
55
versions:
66
ghec: '*'
7+
redirect_from:
8+
- /early-access/admin/using-a-data-resident-enterprise-on-github/about-data-locality
9+
- /early-access/admin/using-a-data-resident-enterprise-on-github/about-data-residency
10+
- /early-access/admin/preview-of-data-residency-for-github-enterprise/about-data-residency-in-the-european-union
11+
- /early-access/admin/private-ga-of-data-residency-for-github-enterprise-cloud/about-data-residency-in-the-european-union
12+
- /early-access/admin/data-residency-for-github-enterprise-cloud/about-data-residency-in-the-european-union
713
---
814

915
{% data reusables.data-residency.when-you-adopt-data-residency %}

content/admin/data-residency/feature-overview-for-github-enterprise-cloud-with-data-residency.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ shortTitle: Which features are available?
44
intro: "Learn about the available features on {% data variables.enterprise.data_residency_site %}, plus features that work differently from {% data variables.product.prodname_dotcom_the_website %}."
55
versions:
66
ghec: '*'
7+
redirect_from:
8+
- /early-access/admin/data-residency-for-github-enterprise-cloud/feature-overview-for-github-enterprise-cloud-with-data-residency
79
---
810

911
{% data reusables.data-residency.data-resident-enterprise-feature-availability %} Some features work differently or require additional configuration compared to the equivalent feature on {% data variables.product.prodname_dotcom_the_website %}.

content/admin/data-residency/getting-started-with-data-residency-for-github-enterprise-cloud.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ shortTitle: Get started
44
intro: "Set up your enterprise on {% data variables.enterprise.data_residency_site %} by onboarding users, enabling billing, and migrating data."
55
versions:
66
ghec: '*'
7+
redirect_from:
8+
- /early-access/admin/using-a-data-local-enterprise-on-github/getting-started-with-a-data-local-enterprise
9+
- /early-access/admin/using-a-data-local-enterprise-on-github/getting-started-with-a-data-resident-enterprise
10+
- /early-access/admin/preview-of-data-residency-for-github-enterprise/getting-started-with-the-preview-of-data-residency
11+
- /early-access/admin/private-ga-of-data-residency-for-github-enterprise-cloud/getting-started-with-the-private-ga-of-data-residency
12+
- /early-access/admin/data-residency-for-github-enterprise-cloud/getting-started-with-data-residency-for-github-enterprise-cloud
13+
- /early-access/admin/preview-of-data-residency-for-github-enterprise/configuring-authentication-and-provisioning-for-your-enterprise
14+
- /early-access/admin/private-ga-of-data-residency-for-github-enterprise-cloud/configuring-authentication-and-provisioning-for-your-enterprise
15+
- /early-access/admin/data-residency-for-github-enterprise-cloud/configuring-authentication-and-provisioning-for-your-enterprise
716
---
817

918
When you adopt {% data variables.enterprise.data_residency %}, you can choose where your company's code and data are stored.

content/admin/data-residency/index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,10 @@ children:
1010
- /getting-started-with-data-residency-for-github-enterprise-cloud
1111
- /network-details-for-ghecom
1212
- /resolving-issues-with-your-enterprise-on-ghecom
13+
redirect_from:
14+
- /early-access/admin/using-a-data-local-enterprise-on-github
15+
- /early-access/admin/using-a-data-resident-enterprise-on-github
16+
- /early-access/admin/preview-of-data-residency-for-github-enterprise
17+
- /early-access/admin/private-ga-of-data-residency-for-github-enterprise-cloud
18+
- /early-access/admin/data-residency-for-github-enterprise-cloud
1319
---

content/admin/data-residency/network-details-for-ghecom.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ shortTitle: Network details
44
intro: 'Ensure client systems can access your resources on {% data variables.enterprise.data_residency_site %}.'
55
versions:
66
ghec: '*'
7+
redirect_from:
8+
- /early-access/admin/preview-of-data-residency-for-github-enterprise/network-access-to-resources-on-ghecom
9+
- /early-access/admin/private-ga-of-data-residency-for-github-enterprise-cloud/network-access-to-resources-on-ghecom
10+
- /early-access/admin/data-residency-for-github-enterprise-cloud/network-access-to-resources-on-ghecom
711
---
812

913
To access your enterprise on {% data variables.enterprise.data_residency_site %}, client systems must:

content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-invitations-to-organizations-within-your-enterprise.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ topics:
1111
shortTitle: Manage organization invitations
1212
permissions: Enterprise owners can manage invitations to organizations within their enterprise.
1313
redirect_from:
14-
- /admin/user-management/managing-users-in-your-enterprise/mmanaging-invitations-to-organizations-within-your-enterprise
14+
- /admin/user-management/managing-users-in-your-enterprise/managing-invitations-to-organizations-within-your-enterprise
1515
---
1616

1717
You can manage invitations to your enterprise or organizations within your enterprise.

content/admin/upgrading-your-instance/performing-an-upgrade/upgrading-with-an-upgrade-package.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ To upgrade an instance that comprises multiple nodes using an upgrade package, y
9191
1. Upgrade the node by following the instructions in "[Upgrading a standalone instance using an upgrade package](#upgrading-a-standalone-instance-using-an-upgrade-package)."
9292
{% data reusables.enterprise_installation.replica-ssh %}
9393
{% data reusables.enterprise_installation.replica-verify %}
94-
{% data reusables.enterprise_installation.start-replication %}{% ifversion ghes > 3.13 %} Alternatively, if there are mutliple replicas, run `ghe-repl-start-all` on the primary node instead, which will start replications in a single run.{% endif %}
94+
{% data reusables.enterprise_installation.start-replication %}{% ifversion ghes > 3.13 %} Alternatively, if there are multiple replicas, run `ghe-repl-start-all` on the primary node instead, which will start replications in a single run.{% endif %}
9595
{% data reusables.enterprise_installation.replication-status %} {% data reusables.enterprise_installation.replication-status-upgrade %}
9696
{% data reusables.enterprise_installation.multiple-node-repeat-upgrade-process %}
9797
{% data reusables.enterprise_installation.disable-maintenance-mode-after-replica-upgrade %}

content/admin/upgrading-your-instance/preparing-to-upgrade/overview-of-the-upgrade-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Ensure you have a recent, successful backup snapshot of your instance's primary
9595

9696
### Create a VM snapshot
9797

98-
If you're upgrading to a new feature release, a virtual machine (VM) snapshot is required. If you're ugprading to a patch release, you can attach the existing data disk.
98+
If you're upgrading to a new feature release, a virtual machine (VM) snapshot is required. If you're upgrading to a patch release, you can attach the existing data disk.
9999

100100
Create a virtual machine (VM) snapshot of your instance's primary node immediately before upgrading, and only when maintenance mode has been enabled or the instance has been powered down. See "[AUTOTITLE](/admin/upgrading-your-instance/preparing-to-upgrade/taking-a-snapshot)".
101101

content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,6 @@ If the user account you used to sign into Azure does not have adequate permissio
170170

171171
> **Need admin approval**
172172
>
173-
> GitHub Inc needs permission to access resources in your organisation that only an admin can grant. Please ask an admin to grant permission to this app before you can use it.
173+
> GitHub Inc needs permission to access resources in your organization that only an admin can grant. Please ask an admin to grant permission to this app before you can use it.
174174
175175
To avoid this message when you try again, you must either ensure that the Azure user can provide tenant-wide admin consent, or you must work with an Azure administrator to configure the admin consent workflow. For more information, review "[Prerequisites](#prerequisites)."

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ If you have access, there will be a {% octicon "credit-card" aria-hidden="true"
5454

5555
## Next steps
5656

57-
* To **get started with the new billing plaform**, see "[AUTOTITLE](/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform)."
57+
* To **get started with the new billing platform**, see "[AUTOTITLE](/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform)."

content/code-security/code-scanning/troubleshooting-code-scanning/advanced-security-must-be-enabled.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This error is reported if you try to run {% data variables.product.prodname_code
2828
## Confirming the cause of the error
2929

3030
{% ifversion fpt %}
31-
If you are on a free, pro, or team plan, you can only use {% data variables.product.prodname_code_scanning %} on repositories that are publically available. To enable {% data variables.product.prodname_code_scanning %} for private or internal repositories, you must upgrade to GitHub Enterprise with {% data variables.product.prodname_GH_advanced_security %} and enable {% data variables.product.prodname_GH_advanced_security %} for the repository. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products#github-enterprise)" and "[AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security)."
31+
If you are on a free, pro, or team plan, you can only use {% data variables.product.prodname_code_scanning %} on repositories that are publicly available. To enable {% data variables.product.prodname_code_scanning %} for private or internal repositories, you must upgrade to GitHub Enterprise with {% data variables.product.prodname_GH_advanced_security %} and enable {% data variables.product.prodname_GH_advanced_security %} for the repository. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products#github-enterprise)" and "[AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security)."
3232

3333
{% else %}
3434

content/code-security/code-scanning/troubleshooting-code-scanning/cannot-enable-codeql-in-a-private-repository.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ versions:
1414
---
1515

1616
{% ifversion fpt %}
17-
If you are on a free, pro, or team plan, you can only use {% data variables.product.prodname_code_scanning %} on repositories that are publically available. To enable {% data variables.product.prodname_code_scanning %} for private or internal repositories, you must upgrade to GitHub Enterprise with {% data variables.product.prodname_GH_advanced_security %} and enable {% data variables.product.prodname_GH_advanced_security %} for the repository. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products#github-enterprise)" and "[AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security)."
17+
If you are on a free, pro, or team plan, you can only use {% data variables.product.prodname_code_scanning %} on repositories that are publicly available. To enable {% data variables.product.prodname_code_scanning %} for private or internal repositories, you must upgrade to GitHub Enterprise with {% data variables.product.prodname_GH_advanced_security %} and enable {% data variables.product.prodname_GH_advanced_security %} for the repository. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products#github-enterprise)" and "[AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security)."
1818

1919
{% else %}
2020

content/code-security/code-scanning/troubleshooting-sarif-uploads/results-exceed-limit.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,4 @@ There are a few steps to fix this problem.
106106

107107
On top of fixing the code scanning configuration and removing or fixing the output of third-party tools, you will need to contact {% data variables.contact.contact_support %} to assist you in deleting the alerts for any offending configurations.
108108

109-
**There is no self-service method for deleting alerts at this time, so contacting customer support is neccessary before code-scanning can be re-enabled.**
109+
**There is no self-service method for deleting alerts at this time, so contacting customer support is necessary before code-scanning can be re-enabled.**

content/code-security/codeql-for-vs-code/using-the-advanced-functionality-of-the-codeql-for-vs-code-extension/telemetry-in-codeql-for-visual-studio-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ If you opt in, {% data variables.product.company_short %} collects the following
3434

3535
* The identifiers of any {% data variables.product.prodname_codeql %}-related {% data variables.product.prodname_vscode_shortname %} commands that are run. For each command, these are: the timestamp, time taken, and whether or not the command completed successfully.
3636

37-
* Interactions with UI elements, including buttons, links, and other inputs. Intereacts that are not recorded are: link targets, text inputs, mouse movement, and mouse hovering.
37+
* Interactions with UI elements, including buttons, links, and other inputs. Interacts that are not recorded are: link targets, text inputs, mouse movement, and mouse hovering.
3838

3939
* Occurrence of exceptions and errors. All sensitive information such as file paths and non-static exception message content are removed before uploading.
4040

0 commit comments

Comments
 (0)