Skip to content

Commit be5e4de

Browse files
authored
Merge branch 'main' into lowest
2 parents 3458636 + e4f7ca8 commit be5e4de

File tree

1,546 files changed

+1368865
-876048
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,546 files changed

+1368865
-876048
lines changed

.devcontainer/devcontainer.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,19 @@
1515
"cSpell.language": ",en"
1616
},
1717

18+
// Install features. Type 'feature' in the VS Code command palette for a full list.
19+
"features": {
20+
"git-lfs": "latest"
21+
},
22+
1823
// Visual Studio Code extensions which help authoring for docs.github.com.
1924
"extensions": [
2025
"dbaeumer.vscode-eslint",
2126
"sissel.shopify-liquid",
2227
"davidanson.vscode-markdownlint",
2328
"bierner.markdown-preview-github-styles",
2429
"streetsidesoftware.code-spell-checker",
25-
"hubwriter.open-reusable"
30+
"alistairchristie.open-reusables"
2631
],
2732

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

.github/CODEOWNERS

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,11 @@ package.json @github/docs-engineering
2424
/translations/log/ @github/docs-localization @Octomerger
2525

2626
# Site Policy
27-
/content/github/site-policy/ @github/site-policy-admins
27+
/content/site-policy/ @github/site-policy-admins
2828

2929
# Content strategy
3030
/contributing/content-markup-reference.md @github/docs-content-strategy
3131
/contributing/content-style-guide.md @github/docs-content-strategy
3232
/contributing/content-model.md @github/docs-content-strategy
3333
/contributing/content-style-guide.md @github/docs-content-strategy
3434
/contributing/content-templates.md @github/docs-content-strategy
35-
36-
# Make sure that Octokit maintainers get notified about changes
37-
# relevant to the Octokit libraries (https://github.com/octokit)
38-
/content/rest/reference @github/octokit-maintainers

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

Lines changed: 20 additions & 10 deletions

.github/actions-scripts/get-preview-app-info.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
[[ -z $APP_NAME_SEED ]] && { echo "Missing APP_NAME_SEED. Exiting."; exit 1; }
1414

1515
PREVIEW_ENV_LOCATION="eastus"
16-
echo "PREVIEW_ENV_LOCATION=${PREVIEW_ENV_LOCATION}" >> $GITHUB_ENV
1716

1817
REPO_NAME="${GITHUB_REPOSITORY#*\/}"
1918
echo "REPO_NAME=${REPO_NAME}" >> $GITHUB_ENV
@@ -22,15 +21,14 @@ DEPLOYMENT_NAME="${REPO_NAME}-pr-${PR_NUMBER}"
2221
echo "DEPLOYMENT_NAME=${DEPLOYMENT_NAME}" >> $GITHUB_ENV
2322

2423
APP_NAME_BASE="${REPO_NAME}-preview-${PR_NUMBER}"
25-
echo "APP_NAME_BASE=${APP_NAME_BASE}" >> $GITHUB_ENV
2624

2725
# pseudo random string so guessing a preview env URL is more difficult
2826
APP_SHA=$(echo -n "${APP_NAME_SEED}-${APP_NAME_BASE}" | sha1sum | cut -c1-6)
2927

3028
APP_NAME="${APP_NAME_BASE}-${APP_SHA}"
3129
echo "APP_NAME=${APP_NAME}" >> $GITHUB_ENV
3230

33-
APP_URL="https://${APP_NAME}.${PREVIEW_ENV_LOCATION}.azurecontainer.io"
31+
APP_URL="https://${REPO_NAME}-${PR_NUMBER}-${APP_SHA}.preview.ghdocs.com"
3432
echo "APP_URL=${APP_URL}" >> $GITHUB_ENV
3533

3634
IMAGE_REPO="${GITHUB_REPOSITORY}/pr-${PR_NUMBER}"

.github/actions-scripts/projects.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ export function generateUpdateProjectNextItemFieldMutation({
190190
// Strip all non-alphanumeric out of the item ID when creating the mutation ID to avoid a GraphQL parsing error
191191
// (statistically, this should still give us a unique mutation ID)
192192
return `
193-
set_${fieldID.substr(1)}_item_${item.replaceAll(
193+
set_${fieldID.slice(1)}_item_${item.replaceAll(
194194
/[^a-z0-9]/g,
195195
''
196196
)}: updateProjectNextItemField(input: {

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165
rsync -rptovR ./user-code/content/./**/*.md ./content
166166
rsync -rptovR ./user-code/assets/./**/*.png ./assets
167167
rsync -rptovR ./user-code/data/./**/*.{yml,md} ./data
168-
rsync -rptovR ./user-code/components/./**/*.{ts,tsx} ./components
168+
rsync -rptovR ./user-code/components/./**/*.{scss,ts,tsx} ./components
169169
rsync -rptovR --ignore-missing-args ./user-code/lib/./**/*.{js,ts} ./lib
170170
rsync -rptovR --ignore-missing-args ./user-code/middleware/./**/*.{js,ts} ./middleware
171171
rsync -rptovR ./user-code/pages/./**/*.tsx ./pages
@@ -203,13 +203,10 @@ jobs:
203203
template: ./azure-preview-env-template.json
204204
deploymentName: ${{ env.DEPLOYMENT_NAME }}
205205
parameters: appName="${{ env.APP_NAME }}"
206-
location="${{ env.PREVIEW_ENV_LOCATION }}"
207206
containerImage="${{ env.DOCKER_IMAGE }}"
208207
dockerRegistryUrl="${{ secrets.NONPROD_REGISTRY_SERVER }}"
209208
dockerRegistryUsername="${{ secrets.NONPROD_REGISTRY_USERNAME }}"
210209
dockerRegistryPassword="${{ secrets.NONPROD_REGISTRY_PASSWORD }}"
211-
storageAccountName="${{ secrets.AZURE_STORAGE_ACCOUNT_NAME }}"
212-
storageAccountKey="${{ secrets.AZURE_STORAGE_ACCOUNT_KEY }}"
213210
# this shows warnings in the github actions console, because the flag is passed through a validation run,
214211
# but it *is* functional during the actual execution
215212
additionalArguments: --no-wait

.github/workflows/browser-test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,8 @@ jobs:
5959
path: .next/cache
6060
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}
6161

62+
- name: Run build script
63+
run: npm run build
64+
6265
- name: Run browser-test
6366
run: npm run browser-test

.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/openapi-decorate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ 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
6060
add: '["lib/rest/static/apps", "lib/rest/static/decorated"]'

.github/workflows/optimize-images.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ jobs:
2323
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
2424
with:
2525
ref: ${{ github.head_ref }}
26+
# Need to specify a PAT here because otherwise GITHUB_TOKEN is used
27+
# by default. Workflows won't trigger in that case because actions
28+
# performed with GITHUB_TOKEN don't trigger other workflows.
29+
token: ${{ secrets.DOCUBOT_REPO_PAT }}
2630

2731
- name: Check out base ref
2832
run: git fetch --no-tags --depth=1 origin $GITHUB_BASE_REF

0 commit comments

Comments
 (0)