Skip to content

Commit b668836

Browse files
authored
Merge pull request #46419 from github/repo-sync
Repo sync
2 parents 5815d11 + 680996e commit b668836

7 files changed

Lines changed: 43 additions & 7 deletions

File tree

‎.github/workflows/close-on-invalid-label.yaml‎

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
name: Close issue/PR on adding invalid label
22

33
# Closes public issues and PRs when the invalid label is added.
4+
# Re-closes invalid PRs that someone without write access reopens.
45

56
on:
67
issues:
78
types: [labeled]
8-
# pull_request_target lets the workflow close forked PRs after the invalid label is added.
9+
# pull_request_target lets the workflow close forked PRs when they're labeled invalid or reopened.
910
pull_request_target:
10-
types: [labeled]
11+
types: [labeled, reopened]
1112

1213
permissions:
1314
contents: read
14-
issues: write
15-
pull-requests: write
1615

1716
jobs:
1817
close-on-adding-invalid-label:
1918
if: github.repository == 'github/docs' && github.event.label.name == 'invalid'
2019
runs-on: ubuntu-latest
20+
permissions:
21+
contents: read
22+
issues: write
23+
pull-requests: write
2124

2225
steps:
2326
- name: Close issue
@@ -42,3 +45,29 @@ jobs:
4245
if: ${{ failure() && github.event_name != 'pull_request_target' }}
4346
with:
4447
slack_token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
48+
49+
# Authors can reopen PRs they closed themselves, even after the invalid label is added.
50+
reclose-reopened-invalid-pr:
51+
if: >
52+
github.repository == 'github/docs' && github.event_name == 'pull_request_target' &&
53+
github.event.action == 'reopened' &&
54+
contains(github.event.pull_request.labels.*.name, 'invalid')
55+
runs-on: ubuntu-latest
56+
permissions:
57+
pull-requests: write
58+
steps:
59+
- name: Re-close PR unless reopened by someone with write access
60+
env:
61+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
62+
PR_URL: ${{ github.event.pull_request.html_url }}
63+
SENDER: ${{ github.event.sender.login }}
64+
run: |
65+
if ! permission=$(gh api "repos/$GITHUB_REPOSITORY/collaborators/$SENDER/permission" --jq '.permission'); then
66+
echo "::warning::Couldn't look up permission for $SENDER, so treating them as read-only."
67+
permission=none
68+
fi
69+
if [[ "$permission" == "admin" || "$permission" == "write" ]]; then
70+
echo "$SENDER has $permission access, so leaving the PR open."
71+
exit 0
72+
fi
73+
gh pr close "$PR_URL" --comment 'This pull request is labeled `invalid`, so only maintainers can reopen it. If you think this is incorrect, please mention this in a corresponding issue.'

‎.github/workflows/repo-sync.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ jobs:
3030
persist-credentials: false
3131
- name: Sync repo to branch
3232
env:
33-
SOURCE_REPO: https://${{ secrets.DOCS_BOT_PAT_REPO_SYNC }}@github.com/github/${{ github.repository == 'github/docs-internal' && 'docs' || 'docs-internal' }}.git
33+
# https://github.com/actions/runner-images/issues/15014
34+
SOURCE_REPO: https://x-access-token:${{ secrets.DOCS_BOT_PAT_REPO_SYNC }}@github.com/github/${{ github.repository == 'github/docs-internal' && 'docs' || 'docs-internal' }}.git
3435
SOURCE_BRANCH: main
3536
DESTINATION_BRANCH: repo-sync
3637
GH_TOKEN: ${{ secrets.DOCS_BOT_PAT_REPO_SYNC }}

‎content/admin/data-residency/github-copilot-with-data-residency.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ The models available for {% data variables.product.prodname_copilot_short %} var
7171
* {% data variables.copilot.claude_opus_55 %}
7272
* {% data variables.copilot.claude_sonnet_5 %}
7373
* {% data variables.copilot.claude_sonnet_55 %}
74+
* {% data variables.copilot.gemini_4_argon %}
7475

7576
## Pricing changes
7677

‎content/code-security/how-tos/secure-your-secrets/customize-leak-detection/exclude-folders-and-files.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ category:
1717

1818
You may have a reason to commit a secret to a repository, such as when you want to provide a fake secret in documentation, or in an example application. In these scenarios, you can quickly dismiss the alert and document the reasons. However, there may be cases where you want to ignore a directory entirely to avoid creating false positive alerts at scale. For example, you might have a monolithic application with several integrations containing a file of dummy keys that could set off numerous false alerts to triage.
1919

20-
You can configure a `secret_scanning.yml` file to automatically close alerts found in specific directories from {% data variables.product.prodname_secret_scanning %}, and exclude these directories included in push protection. These alerts are closed as "ignored by configuration".
20+
You can configure a `secret_scanning.yml` file to automatically close alerts found in specific directories from {% data variables.product.prodname_secret_scanning %}, and exclude these directories included in push protection. These alerts are closed as "ignored by configuration". They do not trigger `secret_scanning_alert` or `secret_scanning_alert_location` webhook events.
2121

2222
## Excluding directories from {% data variables.secret-scanning.user_alerts %}
2323

‎content/copilot/reference/copilot-cli-reference/cli-config-dir-reference.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,10 @@ The `/sandbox` dialog groups Git authentication, `gh` authentication, and masked
545545

546546
Host rules and `sandbox.userPolicy.network.proxy` use a built-in local proxy. When both are configured, the local proxy applies the host rules before forwarding traffic to the upstream proxy. Upstream credentials stay outside the sandboxed child process. Host rules and proxy settings are inactive when outbound access is off.
547547

548+
When no proxy is set in sandbox settings, the local proxy selects its upstream proxy from the first non-empty environment variable on the host in this order: `HTTPS_PROXY`, `HTTP_PROXY`, `ALL_PROXY`. Only `http://` and `https://` proxies are supported, not `socks5`.
549+
550+
Destinations matching the host's `NO_PROXY` bypass only this inherited upstream proxy. The sandbox's local proxy still handles these connections and applies its host rules. A proxy configured in sandbox settings ignores `NO_PROXY`.
551+
548552
On macOS and Linux, the sandbox restricts direct connections so programs cannot avoid the proxy. On Windows, the sandbox relies on programs honoring the proxy settings. As a result, programs that ignore the proxy settings on Windows can connect directly and get around your host rules. Windows proxying and host rules also require a supported host and `allowLocalNetwork: true`, which permits private-network access. On Linux, proxy settings reject IPv6 address literals other than the `[::]` dual-stack wildcard. Use an IPv4 endpoint or a hostname with IPv4 support.
549553

550554
Sandbox settings are user-level or enterprise-managed. They are not repository-overridable. For configuration steps and network limitations, see [AUTOTITLE](/copilot/how-tos/cloud-and-local-sandboxes/configuring-local-sandbox-settings).

‎data/reusables/copilot/model-compliance/us-models.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
* Claude Opus 4.8
1212
* Claude Opus 5
1313
* Claude Opus 5.5
14+
* Gemini 4 Argon
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4fe31058ce5a3e55180ccda41fc625afcb7f5ead
1+
394f59ad9f91b3772c5ca6d45ebd8ce48150e9b7

0 commit comments

Comments
 (0)