Skip to content

Commit c9e4ba7

Browse files
authored
Merge branch 'main' into fix/github#14492
2 parents a0c0780 + 7dd5a04 commit c9e4ba7

File tree

1,641 files changed

+248084
-683265
lines changed

Some content is hidden

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

1,641 files changed

+248084
-683265
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"davidanson.vscode-markdownlint",
2323
"bierner.markdown-preview-github-styles",
2424
"streetsidesoftware.code-spell-checker",
25-
"hubwriter.open-reusable"
25+
"docs.open-reusables"
2626
],
2727

2828
// Use 'forwardPorts' to make a list of ports inside the container available locally.

.github/actions-scripts/enterprise-server-issue-templates/deprecation-issue.md

Lines changed: 2 additions & 0 deletions

.github/actions-scripts/enterprise-server-issue-templates/release-issue.md

Lines changed: 20 additions & 10 deletions

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,3 @@ updates:
2626
schedule:
2727
interval: weekly
2828
day: thursday
29-
ignore:
30-
- dependency-name: '*'
31-
update-types:
32-
['version-update:semver-patch', 'version-update:semver-minor']

.github/workflows/azure-preview-env-deploy.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ on:
2727
description: 'The commit SHA to build'
2828
type: string
2929
required: true
30+
push:
31+
branches:
32+
- gh-readonly-queue/main/**
3033

3134
permissions:
3235
contents: read
@@ -50,7 +53,7 @@ jobs:
5053
# to link a PR to a list of environments later.
5154
url: ${{ env.APP_URL }}
5255
env:
53-
PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER }}
56+
PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER || github.run_id }}
5457
COMMIT_REF: ${{ github.event.pull_request.head.sha || github.event.inputs.COMMIT_REF }}
5558
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
5659
IS_INTERNAL_BUILD: ${{ github.repository == 'github/docs-internal' }}
@@ -162,6 +165,11 @@ jobs:
162165
rsync -rptovR ./user-code/content/./**/*.md ./content
163166
rsync -rptovR ./user-code/assets/./**/*.png ./assets
164167
rsync -rptovR ./user-code/data/./**/*.{yml,md} ./data
168+
rsync -rptovR ./user-code/components/./**/*.{scss,ts,tsx} ./components
169+
rsync -rptovR --ignore-missing-args ./user-code/lib/./**/*.{js,ts} ./lib
170+
rsync -rptovR --ignore-missing-args ./user-code/middleware/./**/*.{js,ts} ./middleware
171+
rsync -rptovR ./user-code/pages/./**/*.tsx ./pages
172+
rsync -rptovR ./user-code/stylesheets/./**/*.scss ./stylesheets
165173
166174
# In addition to making the final image smaller, we also save time by not sending unnecessary files to the docker build context
167175
- name: 'Prune for preview env'

.github/workflows/azure-preview-env-destroy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
# This will fail if the IMAGE_REPO doesn't exist, but we don't care
6262
- name: 'Untag all docker images for this PR'
6363
run: |
64-
az acr repository delete -n ${{ secrets.NONPROD_REGISTRY_NAME }} --repository ${{ env.IMAGE_REPO }} -y || true
64+
az acr repository delete -n ${{ secrets.NONPROD_REGISTRY_SERVER }} --repository ${{ env.IMAGE_REPO }} -y || true
6565
6666
# Remove all GitHub deployments from this environment and remove the environment
6767
- uses: strumwolf/delete-deployment-environment@45c821e46baa405e25410700fe2e9643929706a0

.github/workflows/crowdin-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: script/i18n/homogenize-frontmatter.js
4242

4343
- name: Check in homogenized files
44-
uses: EndBug/add-and-commit@756d9ea820f11931e591eaf57f25e0f5b903d5b2
44+
uses: EndBug/add-and-commit@050a66787244b10a4874a2a5f682130263edc192
4545
with:
4646
# The arguments for the `git add` command
4747
add: 'translations'

.github/workflows/link-check-all.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
push:
1010
branches:
1111
- main
12+
- gh-readonly-queue/main/**
1213
pull_request:
1314

1415
permissions:

.github/workflows/move-ready-to-merge-pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: move PR
2525
uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
2626
with:
27-
project: Docs team reviews
27+
project: Docs open source board
2828
column: Triage
2929
repo-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }}
3030

.github/workflows/openapi-decorate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ jobs:
5454
run: script/rest/update-files.js --decorate-only
5555

5656
- name: Check in the decorated files
57-
uses: EndBug/add-and-commit@756d9ea820f11931e591eaf57f25e0f5b903d5b2
57+
uses: EndBug/add-and-commit@050a66787244b10a4874a2a5f682130263edc192
5858
with:
5959
# The arguments for the `git add` command
60-
add: 'lib/rest/static/decorated'
60+
add: '["lib/rest/static/apps", "lib/rest/static/decorated"]'
6161

6262
# The message for the commit
6363
message: 'Add decorated OpenAPI schema files'

0 commit comments

Comments
 (0)