Skip to content

Commit 82151c7

Browse files
authored
Merge pull request #40798 from github/repo-sync
Repo sync
2 parents 295cd4f + ac1d81d commit 82151c7

File tree

12 files changed

+33
-35
lines changed

12 files changed

+33
-35
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,3 @@ src/ghes-releases/lib/enterprise-dates.json @github/docs-content-enterprise
1212

1313
# Requires review of #actions-oidc-integration, docs-engineering/issues/1506
1414
# content/actions/deployment/security-hardening-your-deployments/** @github/oidc
15-
16-
# RAI - CELA
17-
data/reusables/rai/** @github/legal-product

content/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Your workflow will need to use the `upload-sarif` action, which is part of the `
5656
* `sarif_file`, which configures the file or directory of SARIF files to be uploaded. The directory or file path is relative to the root of the repository.
5757
* `category` (optional), which assigns a category for results in the SARIF file. This enables you to analyze the same commit in multiple ways and review the results using the {% data variables.product.prodname_code_scanning %} views in {% data variables.product.prodname_dotcom %}. For example, you can analyze using multiple tools, and in mono-repos, you can analyze different slices of the repository based on the subset of changed files.
5858

59-
For more information, see the [`upload-sarif` action](https://github.com/github/codeql-action/tree/v3/upload-sarif).
59+
For more information, see the [`upload-sarif` action](https://github.com/github/codeql-action/tree/v4/upload-sarif).
6060

6161
The `upload-sarif` action can be configured to run when the `push` and `scheduled` event occur. For more information about {% data variables.product.prodname_actions %} events, see [AUTOTITLE](/actions/using-workflows/events-that-trigger-workflows).
6262

content/copilot/get-started/choose-enterprise-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ When you've determined whether premium requests and {% data variables.copilot.co
7171

7272
Sign up:
7373

74-
<a href="https://github.com/github-copilot/purchase?priority=business&cft=copilot_li.copilot_plans.cfb" target="_blank" class="btn btn-outline mt-3 mr-3 no-underline"><span>Copilot Business</span></a> <a href="https://github.com/github-copilot/purchase?priority=enterprise&cft=copilot_li.copilot_plans.ce" target="_blank" class="btn btn-outline mt-3 mr-3 no-underline"><span>Copilot Enterprise</span></a>
74+
<a href="https://github.com/github-copilot/purchase?ref_product=copilot&ref_type=purchase&ref_style=button&ref_plan=business" target="_blank" class="btn btn-outline mt-3 mr-3 no-underline"><span>Copilot Business</span></a> <a href="https://github.com/github-copilot/purchase?ref_product=copilot&ref_type=purchase&ref_style=button&ref_plan=enterprise" target="_blank" class="btn btn-outline mt-3 mr-3 no-underline"><span>Copilot Enterprise</span></a>
7575

7676
{% endnote %}
7777

content/copilot/get-started/plans.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ Start using {% data variables.product.prodname_copilot_short %} by signing up fo
4141

4242
* **{% data variables.copilot.copilot_free_short %}** — Try {% data variables.product.prodname_copilot_short %} with limited features and requests. [Start using {% data variables.copilot.copilot_free_short %}](https://github.com/copilot).
4343

44-
* **{% data variables.copilot.copilot_pro_short %}** — Get unlimited completions and access to premium models. Includes a free 30-day trial for eligible users. [Try {% data variables.copilot.copilot_pro_short %} for free](https://github.com/github-copilot/signup?ref_product=copilot&ref_type=trial&ref_style=text).
44+
* **{% data variables.copilot.copilot_pro_short %}** — Get unlimited completions and access to premium models. Includes a free 30-day trial for eligible users. [Try {% data variables.copilot.copilot_pro_short %} for free](https://github.com/github-copilot/signup?ref_product=copilot&ref_type=trial&ref_style=text&ref_plan=pro).
4545

4646
* **{% data variables.copilot.copilot_pro_plus_short %}** — Unlock advanced AI models, extended request limits, and extra capabilities. [Subscribe to {% data variables.copilot.copilot_pro_plus_short %}](https://github.com/github-copilot/signup?ref_product=copilot&ref_type=purchase&ref_style=text&ref_plan=pro).
4747

48-
* **{% data variables.copilot.copilot_business_short %}** — For teams and organizations. [Subscribe to {% data variables.copilot.copilot_business_short %}](https://github.com/github-copilot/purchase?priority=business&cft=copilot_li.copilot_plans.cfb).
48+
* **{% data variables.copilot.copilot_business_short %}** — For teams and organizations. [Subscribe to {% data variables.copilot.copilot_business_short %}](https://github.com/github-copilot/purchase?ref_product=copilot&ref_type=purchase&ref_style=button&ref_plan=business).
4949

50-
* **{% data variables.copilot.copilot_enterprise_short %}** — For enterprises that need advanced features and centralized management. [Subscribe to {% data variables.copilot.copilot_enterprise_short %}](https://github.com/github-copilot/purchase?priority=enterprise&cft=copilot_li.copilot_plans.ce).
50+
* **{% data variables.copilot.copilot_enterprise_short %}** — For enterprises that need advanced features and centralized management. [Subscribe to {% data variables.copilot.copilot_enterprise_short %}](https://github.com/github-copilot/purchase?ref_product=copilot&ref_type=purchase&ref_style=button&ref_plan=enterprise).

content/copilot/get-started/what-is-github-copilot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ There are a few ways you can start using {% data variables.product.prodname_copi
6060
### For individuals
6161

6262
* **Try {% data variables.product.prodname_copilot_short %} for free**: Use {% data variables.copilot.copilot_free_short %} to explore core {% data variables.product.prodname_copilot_short %} features with no paid plan required.
63-
* **Subscribe to a paid plan**: Upgrade to {% data variables.copilot.copilot_pro_short %} or {% data variables.copilot.copilot_pro_plus_short %} for full access to premium features and more generous usage limits. You can <a href="https://github.com/github-copilot/signup?ref_product=copilot&ref_type=trial&ref_style=text" target="_blank"><span>try {% data variables.copilot.copilot_pro_short %} for free</span></a> with a one-time 30-day trial.
63+
* **Subscribe to a paid plan**: Upgrade to {% data variables.copilot.copilot_pro_short %} or {% data variables.copilot.copilot_pro_plus_short %} for full access to premium features and more generous usage limits. You can <a href="https://github.com/github-copilot/signup?ref_product=copilot&ref_type=trial&ref_style=text&ref_plan=pro" target="_blank"><span>try {% data variables.copilot.copilot_pro_short %} for free</span></a> with a one-time 30-day trial.
6464
* **Eligible for free {% data variables.copilot.copilot_pro_short %} access?** Students, teachers, and open source maintainers may qualify for {% data variables.copilot.copilot_pro_short %} at no cost. See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/getting-free-access-to-copilot-as-a-student-teacher-or-maintainer).
6565
* **Organization members**: If your organization or enterprise has a {% data variables.product.prodname_copilot %} plan, you can request access to {% data variables.product.prodname_copilot_short %} by going to [https://github.com/settings/copilot](https://github.com/settings/copilot) and requesting access under "Get {% data variables.product.prodname_copilot_short %} from an organization."
6666

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github/codeql-action/analyze@v3
1+
github/codeql-action/analyze@v4
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github/codeql-action/autobuild@v3
1+
github/codeql-action/autobuild@v4
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github/codeql-action/init@v3
1+
github/codeql-action/init@v4
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github/codeql-action/upload-sarif@v3
1+
github/codeql-action/upload-sarif@v4

src/frame/tests/secure-files.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ import { glob } from 'glob'
1010
* path: Path to secure files (must match entry in CODEOWNERS if code owner required)
1111
* requiredCodeOwner: (optional) Name of code owner if a code owner is required
1212
*/
13-
const secureFiles = [
13+
type SecureFile = {
14+
name: string
15+
path: string
16+
requiredCodeOwner?: string
17+
}
18+
19+
const secureFiles: SecureFile[] = [
1420
{
1521
name: 'Security hardening your deployments',
1622
path: 'content/actions/how-tos/secure-your-work/security-harden-deployments/**',
1723
},
18-
{
19-
name: 'RAI transparency note reusable directory',
20-
path: 'data/reusables/rai',
21-
requiredCodeOwner: 'github/legal-product',
22-
},
2324
]
2425

2526
const codeOwnersFile = await fs.readFile('.github/CODEOWNERS', 'utf8')

0 commit comments

Comments
 (0)