Skip to content

Commit 152d3e8

Browse files
Merge branch 'main' into patch-1
2 parents 4df2e0d + 458757d commit 152d3e8

File tree

333 files changed

+7115
-2127
lines changed

Some content is hidden

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

333 files changed

+7115
-2127
lines changed

.github/branch_protection_settings/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/branch_protection_settings/main.json

Lines changed: 0 additions & 250 deletions
This file was deleted.

.github/workflows/alert-changed-branch-protections.yml

Lines changed: 0 additions & 85 deletions
This file was deleted.

.github/workflows/move-content.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
# These must be set to something before running the move-content
3535
# script because it depends on executing `git mv ...`
3636
# and `git commit ...`
37-
git config --global user.name any-body
38-
git config --global user.email "any-body@example.com"
37+
git config --global user.name "docs-bot"
38+
git config --global user.email "[email protected].com"
3939
4040
- name: Move hello-world.md to hello-wurld.md
4141
env:

.github/workflows/review-comment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,6 @@ jobs:
101101
🤖 This comment is [automatically generated][workflow].
102102
103103
[workflow]: ${{ github.server_url }}/${{ github.repository }}/blob/${{ github.workflow_sha }}/.github/workflows/review-comment.yml
104-
[codespace]: ${{ github.repository == 'github/docs-internal' && 'https://github.com/github/docs-team/blob/main/contributing-to-docs/use-a-codespace-to-review.md' || 'https://docs.github.com/en/contributing/setting-up-your-environment-to-work-on-github-docs/working-on-github-docs-in-a-codespace' }}
104+
[codespace]: ${{ github.repository == 'github/docs-internal' && 'https://github.com/github/docs-team/blob/main/contributing-to-docs/tips-and-tricks/use-a-codespace-to-review.md' || 'https://docs.github.com/en/contributing/setting-up-your-environment-to-work-on-github-docs/working-on-github-docs-in-a-codespace' }}
105105
[local]: https://docs.github.com/en/contributing/setting-up-your-environment-to-work-on-github-docs/creating-a-local-environment#setting-up-your-local-environment
106-
[staging]: https://github.com/github/docs-team/blob/main/contributing-to-docs/deploying-pr-to-staging-servers.md
106+
[staging]: https://github.com/github/docs-team/blob/main/contributing-to-docs/tips-and-tricks/deploying-pr-to-staging-servers.md

.github/workflows/validate-github-github-docs-urls.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ jobs:
5959
run: |
6060
npm run validate-github-github-docs-urls -- generate-new-json checks.json github/config/docs-urls.json
6161
62+
git config --global user.name "docs-bot"
63+
git config --global user.email "[email protected]"
64+
6265
cd github
6366
git status
6467
git diff
@@ -117,7 +120,8 @@ jobs:
117120
GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
118121
ISSUE_NUMBER: ${{ github.event.pull_request.number }}
119122
REPOSITORY: ${{ github.repository }}
120-
run: npm run validate-github-github-docs-urls -- post-pr-comment checks.json --changed-files $CHANGED_FILES
123+
run: |
124+
npm run validate-github-github-docs-urls -- post-pr-comment checks.json --changed-files $CHANGED_FILES
121125
122126
- uses: ./.github/actions/slack-alert
123127
if: ${{ failure() && github.event_name == 'schedule' }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ external-link-checker-db.json
4040
# Automated content source
4141
rest-api-description
4242
semmle-code
43+
models-gateway
4344

4445
.installed.package-lock.json
4546
assets/images/help/writing/unordered-list-rendered (1).png

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# ---------------------------------------------------------------
99
# To update the sha:
1010
# https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
11-
FROM ghcr.io/github/gh-base-image/gh-base-noble:20250407-184504-g7b9deed09 AS base
11+
FROM ghcr.io/github/gh-base-image/gh-base-noble:20250416-142458-gcbbd448ce AS base
1212

1313
# Install curl for Node install and determining the early access branch
1414
# Install git for cloning docs-early-access & translations repos
21.8 KB
Loading
64.5 KB
Loading

0 commit comments

Comments
 (0)