Skip to content

Commit 8543153

Browse files
authored
Merge pull request #43250 from github/repo-sync
Repo sync
2 parents 27d20a7 + 249a816 commit 8543153

File tree

41 files changed

+216
-97
lines changed

Some content is hidden

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

41 files changed

+216
-97
lines changed

.github/workflows/content-pipelines.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ jobs:
6262
echo "pr_number=$PR_NUMBER" >> "$GITHUB_OUTPUT"
6363
6464
- name: Setup branch
65+
id: setup-branch
6566
env:
6667
UPDATE_BRANCH: ${{ steps.branch.outputs.update_branch }}
68+
PR_NUMBER: ${{ steps.check-pr.outputs.pr_number }}
6769
run: |
6870
git config user.name "github-actions[bot]"
6971
git config user.email "github-actions[bot]@users.noreply.github.com"
@@ -76,7 +78,12 @@ jobs:
7678
git merge --abort 2>/dev/null || true
7779
git checkout main
7880
git branch -D "$UPDATE_BRANCH"
79-
git push origin --delete "$UPDATE_BRANCH" || true
81+
if [ -z "$PR_NUMBER" ]; then
82+
git push origin --delete "$UPDATE_BRANCH" || true
83+
else
84+
echo "Skipping remote branch delete — PR #$PR_NUMBER is open"
85+
echo "force_push=true" >> "$GITHUB_OUTPUT"
86+
fi
8087
git checkout -b "$UPDATE_BRANCH"
8188
}
8289
else
@@ -111,12 +118,19 @@ jobs:
111118
if: steps.commit.outputs.has_changes == 'true'
112119
env:
113120
UPDATE_BRANCH: ${{ steps.branch.outputs.update_branch }}
114-
run: git push origin "$UPDATE_BRANCH"
121+
FORCE_PUSH: ${{ steps.setup-branch.outputs.force_push }}
122+
run: |
123+
if [ "$FORCE_PUSH" = "true" ]; then
124+
echo "Force-pushing to align branch after merge conflict reset"
125+
git push --force-with-lease origin "$UPDATE_BRANCH"
126+
else
127+
git push origin "$UPDATE_BRANCH"
128+
fi
115129
116130
- name: Create or update PR
117131
if: steps.commit.outputs.has_changes == 'true'
118132
env:
119-
GH_TOKEN: ${{ github.token }}
133+
GH_TOKEN: ${{ secrets.DOCS_BOT_PAT_BASE }}
120134
UPDATE_BRANCH: ${{ steps.branch.outputs.update_branch }}
121135
PIPELINE_ID: ${{ matrix.id }}
122136
run: |
@@ -136,15 +150,16 @@ jobs:
136150
137151
if [ -n "$PR_NUMBER" ]; then
138152
echo "PR #$PR_NUMBER already exists — new commit pushed"
153+
echo "Ensuring PR #$PR_NUMBER is marked ready for review"
154+
gh pr ready "$PR_NUMBER" || echo "Unable to mark PR #$PR_NUMBER as ready (it may already be ready)"
139155
else
140156
echo "Creating new PR"
141157
gh pr create \
142158
--title "$PR_TITLE" \
143159
--body "$PR_BODY" \
144160
--base main \
145161
--head "$UPDATE_BRANCH" \
146-
--label "workflow-generated,content-pipeline-update" \
147-
--draft
162+
--label "workflow-generated,content-pipeline-update,ready-for-doc-review"
148163
fi
149164
150165
- uses: ./.github/actions/slack-alert

content/actions/concepts/runners/larger-runners.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,26 @@ To learn about larger runners, see [the {% data variables.product.prodname_ghe_c
2424

2525
{% data variables.product.prodname_dotcom %} offers {% data variables.actions.hosted_runners %} with macOS, Ubuntu, or Windows operating systems, and different features and sizes are available depending on which operating system you use.
2626

27+
{% ifversion default-setup-larger-runners %}
28+
29+
## About {% data variables.actions.hosted_runners %} for {% data variables.product.prodname_code_scanning %} default setup
30+
31+
Consider configuring {% data variables.actions.hosted_runners %} for {% data variables.product.prodname_code_scanning %} default setup if:
32+
33+
* Your scans with standard {% data variables.product.prodname_dotcom %}-hosted runners are taking too long.
34+
* Your scans with standard {% data variables.product.prodname_dotcom %}-hosted runners are returning memory or disk errors.
35+
* You want to customize aspects of your {% data variables.product.prodname_code_scanning %} runner, such as the runner size, runner image, and job concurrency, without using self-hosted runners.
36+
37+
For more information on configuring {% data variables.actions.hosted_runners %} for {% data variables.product.prodname_code_scanning %} default setup, see [AUTOTITLE](/code-security/how-tos/scan-code-for-vulnerabilities/manage-your-configuration/configuring-larger-runners-for-default-setup).
38+
39+
{% endif %}
40+
2741
## About Ubuntu and Windows {% data variables.actions.hosted_runners %}
2842

2943
{% data variables.actions.hosted_runner_caps %}s with Ubuntu or Windows operating systems are configured in your organization or enterprise. When you add a {% data variables.actions.hosted_runner %}, you are defining a type of machine from a selection of available hardware specifications and operating system images.
3044

3145
With Ubuntu and Windows {% data variables.actions.hosted_runners %}, you can:
46+
3247
* Assign runners static IP addresses from a specific range, allowing you to use this range to configure a firewall allowlist
3348
* Control access to your resources by assigning runners to runner groups
3449
* Use autoscaling to simplify runner management and control your costs

content/billing/how-tos/products/disable-ghas-for-enterprise.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ intro: Disable {% data variables.product.prodname_GHAS %} and prevent accidental
44
permissions: Enterprise owners
55
versions:
66
feature: disable-ghas-button
7-
topics:
8-
- Billing
9-
- Advanced Security
10-
- Enterprise
117
shortTitle: Disable GHAS for enterprise
128
contentType: how-tos
139
---
@@ -34,4 +30,4 @@ Once you have disabled {% data variables.product.prodname_GHAS %}:
3430
* If you use **volume billing**, you agreed to a number of licenses and billing period upfront. You'll continue to pay for the rest of this period.
3531
* If you use **metered billing**, you pay based on usage, and your billing will stop from next month. However, you _will_ continue paying for any licenses you've already consumed this month until the end of the month.
3632

37-
For example, if you had 10 licenses in use and disabled GHAS on the second day of the month, you will still be billed for your 10 licenses for the full month instead of just for the two days.
33+
For example, if you had 10 licenses in use and disabled {% data variables.product.prodname_GHAS %} on the second day of the month, you will still be billed for your 10 licenses for the full month instead of just for the two days.

content/code-security/concepts/code-scanning/codeql/about-the-codeql-cli.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,12 @@ The {% data variables.product.prodname_codeql_cli %} uses special programs, call
115115

116116
{% data reusables.code-scanning.codeql-license %}
117117

118+
## About {% data variables.product.prodname_codeql_cli %} database bundles
119+
120+
The {% data variables.product.prodname_codeql_cli %} database bundle command can be used to create a relocatable archive of a {% data variables.product.prodname_codeql %} database.
121+
122+
A copy of a database bundle can be used to share troubleshooting information with your team members or with {% data variables.contact.github_support %}. See [AUTOTITLE](/code-security/how-tos/scan-code-for-vulnerabilities/scan-from-the-command-line/creating-database-bundle-for-troubleshooting).
123+
118124
## Getting started
119125

120126
For the simplest way to get started, see [AUTOTITLE](/code-security/codeql-cli/getting-started-with-the-codeql-cli/setting-up-the-codeql-cli).
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
title: About Copilot Autofix for code scanning
3+
shortTitle: Copilot Autofix
4+
allowTitleToDifferFromFilename: true
5+
intro: '{% data variables.copilot.copilot_autofix_short %} provides targeted recommendations to help you fix {% data variables.product.prodname_code_scanning %} alerts and avoid introducing new security vulnerabilities.'
6+
product: '{% data reusables.rai.code-scanning.gated-feature-autofix %}'
7+
versions:
8+
feature: code-scanning-autofix
9+
contentType: concepts
10+
topics:
11+
- Code Security
12+
- Code scanning
13+
- CodeQL
14+
- AI
15+
---
16+
17+
{% data variables.copilot.copilot_autofix_short %} is an expansion of {% data variables.product.prodname_code_scanning %} that provides you with targeted recommendations to help you fix {% data variables.product.prodname_code_scanning %} alerts so you can avoid introducing new security vulnerabilities. The potential fixes are generated automatically by large language models (LLMs) using data from the codebase and from {% data variables.product.prodname_code_scanning %} analysis.
18+
19+
## How {% data variables.copilot.copilot_autofix_short %} works
20+
21+
{% data variables.copilot.copilot_autofix_short %} translates the description and location of an alert into code changes that may fix the alert. It interfaces with the large language model {% data variables.copilot.copilot_gpt_51 %} from OpenAI, which has sufficient generative capabilities to produce both suggested fixes in code and explanatory text for those fixes.
22+
23+
## Enabling and managing {% data variables.copilot.copilot_autofix_short %}
24+
25+
You do not need a subscription to {% data variables.product.prodname_copilot %} to use {% data variables.copilot.copilot_autofix %}. {% data variables.copilot.copilot_autofix_short %} is available to all public repositories on {% data variables.product.prodname_dotcom_the_website %}, as well as internal or private repositories owned by organizations and enterprises that have a license for {% data variables.product.prodname_GH_code_security %}.
26+
27+
{% data variables.copilot.copilot_autofix_short %} is allowed by default and enabled for every repository that uses {% data variables.product.prodname_codeql %}, regardless of whether it uses default or advanced setup for {% data variables.product.prodname_code_scanning %}. There is no separate step to enable {% data variables.copilot.copilot_autofix_short %}: enabling {% data variables.product.prodname_code_scanning %} with {% data variables.product.prodname_codeql %} is sufficient. See [AUTOTITLE](/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning).
28+
29+
Administrators at the enterprise, organization, and repository levels can choose to disable {% data variables.copilot.copilot_autofix_short %}. If {% data variables.copilot.copilot_autofix_short %} has been disabled at your level, you can re-enable it by following the same steps used to disable it and selecting the option to allow {% data variables.copilot.copilot_autofix_short %}. To learn how to manage {% data variables.copilot.copilot_autofix_short %} at each level, see [AUTOTITLE](/code-security/how-tos/manage-security-alerts/manage-code-scanning-alerts/disabling-autofix-for-code-scanning).

content/code-security/concepts/code-scanning/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ contentType: concepts
1515
children:
1616
- /about-code-scanning
1717
- /about-code-scanning-alerts
18+
- /copilot-autofix-for-code-scanning
1819
- /setup-types
1920
- /about-integration-with-code-scanning
2021
- /sarif-files
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
title: Delegated alert dismissal
3+
intro: 'Increase your governance over security alerts with delegated alert dismissal.'
4+
versions:
5+
feature: security-delegated-alert-dismissal
6+
topics:
7+
- Alerts
8+
- Repositories
9+
- Dependencies
10+
- Vulnerabilities
11+
- Secret scanning
12+
- Code scanning
13+
contentType: concepts
14+
---
15+
16+
Delegated alert dismissal lets you restrict which users can directly dismiss an alert. When you enable the feature:
17+
* Users with write access to a repository must request to dismiss alerts in that repository.
18+
* Organization owners and security managers can approve or deny dismissal requests, as well as dismiss alerts directly themselves.
19+
20+
Reviewers are notified of dismissal requests via email, and can either approve the request to dismiss the alert, or deny the request to leave the alert open. After a request is reviewed, the requester is notified of the outcome via email.
21+
22+
## Availability
23+
24+
You can enable delegated alert dismissal for:
25+
* {% data variables.product.prodname_code_scanning_caps %} alerts (available on {% data variables.product.prodname_dotcom_the_website %} and {% data variables.product.prodname_ghe_server %} 3.17+)
26+
* {% data variables.product.prodname_secret_scanning_caps %} alerts (available on {% data variables.product.prodname_dotcom_the_website %} and {% data variables.product.prodname_ghe_server %} 3.17+)
27+
* {% data variables.product.prodname_dependabot_alerts %} (available on {% data variables.product.prodname_dotcom_the_website %} and {% data variables.product.prodname_ghe_server %} 3.21+)
28+
29+
## Custom roles for delegated alert dismissal
30+
31+
You can use a custom role to let team members who are not organization owners or security managers respond to dismissal requests and dismiss alerts directly. The custom role needs the following permissions:
32+
33+
* Organization permissions for reviewing and bypassing alert dismissal requests. To find the exact permissions required for a particular product, see [Permissions for organization access](/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles#permissions-for-organization-access).
34+
* Repository permissions to view, dismiss, and reopen alerts. To find the exact permissions required for a particular product, see [Security](/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles#security).
35+
36+
{% data reusables.organizations.custom-role-repo-perms-preview-note %}
37+
38+
## Next steps
39+
40+
To configure delegated alert dismissal, see:
41+
* [AUTOTITLE](/code-security/how-tos/manage-security-alerts/manage-code-scanning-alerts/enabling-delegated-alert-dismissal-for-code-scanning)
42+
* [AUTOTITLE](/code-security/how-tos/manage-security-alerts/manage-secret-scanning-alerts/enabling-delegated-alert-dismissal-for-secret-scanning){% ifversion dependabot-delegated-alert-dismissal %}
43+
* [AUTOTITLE](/code-security/how-tos/manage-security-alerts/manage-dependabot-alerts/enable-delegated-alert-dismissal){% endif %}

content/code-security/concepts/security-at-scale/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ children:
2020
- /about-security-overview
2121
- /about-security-campaigns
2222
- /auditing-security-alerts
23+
- /delegated-alert-dismissal
2324
- /about-supply-chain-security-for-your-enterprise
2425
redirect_from:
2526
- /admin/managing-code-security/managing-supply-chain-security-for-your-enterprise

0 commit comments

Comments
 (0)