Skip to content

Commit c39cc16

Browse files
authored
Merge branch 'main' into patch-3
2 parents 994a2e2 + 559adc8 commit c39cc16

File tree

162 files changed

+56525
-8562980
lines changed

Some content is hidden

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

162 files changed

+56525
-8562980
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
// Install features. Type 'feature' in the VS Code command palette for a full list.
1919
"features": {
20-
"git-lfs": "latest",
2120
"sshd": "latest"
2221
},
2322

@@ -42,7 +41,7 @@
4241
},
4342

4443
// Use 'postCreateCommand' to run commands after the container is created.
45-
"postCreateCommand": "git lfs pull && npm ci",
44+
"postCreateCommand": "npm ci",
4645

4746
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
4847
"remoteUser": "node"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ This file should be automatically updated, but you can also run `script/update-e
101101
102102
### 🚢 🛳️ 🚢 Shipping the release branch
103103
104-
- [ ] The megabranch creator should push the search index LFS objects for the public `github/docs` repo. The LFS objects were already pushed for the internal repo after the `sync-english-index-for-<PLAN@RELEASE>` was added to the megabranch. To push the LFS objects to the public repo:
104+
- [ ] Sync the search indices for the new release:
105105
1. First navigate to the [sync search indices workflow](https://github.com/github/docs-internal/actions/workflows/sync-search-indices.yml).
106106
2. Then, to run the workflow with parameters, click on `Run workflow` button.
107107
3. A modal will pop up where you will set the following inputs:
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Node set up composite
2+
3+
description: Will set up Node and install all packages by caching node_modules
4+
5+
runs:
6+
using: 'composite'
7+
steps:
8+
- name: Cache node_modules
9+
uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
10+
with:
11+
path: node_modules
12+
key: ${{ runner.os }}-node_modules-${{ hashFiles('package*.json') }}
13+
14+
- name: Setup node
15+
uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
16+
with:
17+
node-version: '16.17.0'
18+
cache: npm
19+
20+
- name: Install dependencies
21+
shell: bash
22+
run: npm install --prefer-offline --no-audit --ignore-scripts

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ jobs:
9191
with:
9292
ref: 'main'
9393
persist-credentials: 'false'
94-
lfs: 'true'
9594

9695
- if: ${{ env.IS_INTERNAL_BUILD == 'true' }}
9796
name: Check out PR code
@@ -100,10 +99,6 @@ jobs:
10099
ref: ${{ env.COMMIT_REF }}
101100
# To prevent issues with cloning early access content later
102101
persist-credentials: 'false'
103-
lfs: 'true'
104-
105-
- name: Check out LFS objects
106-
run: git lfs checkout
107102

108103
- name: Get preview app info
109104
env:

.github/workflows/azure-prod-build-deploy.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -127,22 +127,6 @@ jobs:
127127
token: ${{ secrets.DOCUBOT_REPO_PAT }}
128128
path: translations/ko-kr
129129

130-
# As of Dec 2022, we still have checked in translations into
131-
# the main repo.
132-
# We're going to remove that later.
133-
# For now, just delete the excess directories so they don't add
134-
# unnecessary weight to the container image.
135-
- name: Delete old checked in translation directories (TEMPORARY)
136-
run: |
137-
rm -fr translations/zh-CN
138-
rm -fr translations/ja-JP
139-
rm -fr translations/es-ES
140-
rm -fr translations/pt-BR
141-
rm -fr translations/de-DE
142-
rm -fr translations/fr-FR
143-
rm -fr translations/ru-RU
144-
rm -fr translations/ko-KR
145-
146130
- name: 'Build and push image'
147131
uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0
148132
with:

.github/workflows/azure-staging-build-deploy.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@ jobs:
6565
ref: ${{ env.COMMIT_REF }}
6666
# To prevent issues with cloning early access content later
6767
persist-credentials: 'false'
68-
lfs: 'true'
69-
70-
- name: Check out LFS objects
71-
run: git lfs checkout
7268

7369
- name: 'Set env vars'
7470
run: |

.github/workflows/browser-test.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ jobs:
5050

5151
- name: Checkout
5252
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
53-
with:
54-
lfs: true
55-
56-
- name: Checkout LFS objects
57-
run: git lfs checkout
5853

5954
- name: Setup Node
6055
uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516

.github/workflows/check-broken-links-github-github.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,10 @@ jobs:
5252
path: docs-early-access
5353
ref: main
5454

55-
- name: Setup Node
56-
uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
57-
with:
58-
node-version: '16.17.0'
59-
cache: npm
60-
6155
- name: Merge docs-early-access repo's folders
6256
run: .github/actions-scripts/merge-early-access.sh
6357

64-
- name: Install Node.js dependencies
65-
run: npm ci
58+
- uses: ./.github/actions/node-npm-setup
6659

6760
- name: Build server
6861
run: npm run build

.github/workflows/code-lint.yml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,12 @@ concurrency:
3434
jobs:
3535
lint:
3636
if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
37-
runs-on: ubuntu-latest
37+
runs-on: ${{ fromJSON('["ubuntu-latest", "ubuntu-20.04-xl"]')[github.repository == 'github/docs-internal'] }}
3838
steps:
3939
- name: Check out repo
4040
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
4141

42-
- name: Cache node_modules
43-
uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
44-
with:
45-
path: node_modules
46-
key: ${{ runner.os }}-node_modules-${{ hashFiles('package*.json') }}
47-
48-
- name: Setup node
49-
uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
50-
with:
51-
node-version: '16.17.0'
52-
cache: npm
53-
54-
- name: Install dependencies
55-
run: npm install --prefer-offline --no-audit --ignore-scripts
42+
- uses: ./.github/actions/node-npm-setup
5643

5744
- name: Run linter
5845
run: npm run lint

.github/workflows/content-changes-table-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
run: .github/actions-scripts/content-changes-table-comment.js
7676

7777
- name: Find content directory changes comment
78-
uses: peter-evans/find-comment@1769778a0c5bd330272d749d12c036d65e70d39d
78+
uses: peter-evans/find-comment@f4499a714d59013c74a08789b48abe4b704364a0
7979
id: findComment
8080
with:
8181
issue-number: ${{ github.event.pull_request.number }}

0 commit comments

Comments
 (0)