Skip to content

Commit 9ea55b3

Browse files
authored
Merge branch 'main' into patch-2
2 parents cb22b9c + bfb37ff commit 9ea55b3

File tree

3,814 files changed

+70321
-45132
lines changed

Some content is hidden

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

3,814 files changed

+70321
-45132
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module.exports = {
1313
babelOptions: { configFile: './.babelrc' },
1414
sourceType: 'module',
1515
},
16-
ignorePatterns: ['tmp/*', '!/.*', '/.next/'],
16+
ignorePatterns: ['tmp/*', '!/.*', '/.next/', 'script/bookmarklets/*'],
1717
rules: {
1818
'import/no-extraneous-dependencies': ['error', { packageDir: '.' }],
1919
},

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@ If you aren't comfortable going through the steps alone, sync up with a docs eng
1818
```
1919
script/update-enterprise-dates.js
2020
```
21-
- [ ] Create REST files based on previous version. For example `script/enterprise-server-releases/create-rest-files.js --oldVersion [email protected] --newVersion [email protected]`:
21+
- [ ] Create REST files based on previous version. Copy the latest GHES version of the dereferenced file from `lib/rest/static/dereferenced` to a new file in the same directory for the new GHES release. Ex, `cp lib/rest/static/dereferenced/ghes-3.4.deref.json lib/rest/static/dereferenced/ghes-3.5.deref.json`. Then run `script/rest/updated-files.js --decorate-only` and check in the resulting files.
2222
23-
```
24-
script/enterprise-server-releases/create-rest-files.js --oldVersion <PLAN@RELEASE> --newVersion <PLAN@RELEASE>
25-
```
2623
- [ ] Create GraphQL files based on previous version:
2724
2825
```

.github/workflows/autoupdate-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- name: Check out repo content
43-
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
43+
uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
4444

4545
- name: Setup Node
4646
uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ jobs:
5959
IS_INTERNAL_BUILD: ${{ github.repository == 'github/docs-internal' }}
6060
# This may also run in forked repositories, not just 'github/docs'
6161
IS_PUBLIC_BUILD: ${{ github.repository != 'github/docs-internal' }}
62+
NONPROD_REGISTRY_USERNAME: ${{ fromJSON('["ghdocs", "ghdocsinternal"]')[github.repository == 'github/docs-internal'] }}
6263

6364
steps:
6465
- name: 'Az CLI login'
@@ -70,23 +71,23 @@ jobs:
7071
uses: azure/docker-login@81744f9799e7eaa418697cb168452a2882ae844a
7172
with:
7273
login-server: ${{ secrets.NONPROD_REGISTRY_SERVER }}
73-
username: ${{ secrets.NONPROD_REGISTRY_USERNAME }}
74+
username: ${{ env.NONPROD_REGISTRY_USERNAME }}
7475
password: ${{ secrets.NONPROD_REGISTRY_PASSWORD }}
7576

7677
- name: Set up Docker Buildx
7778
uses: docker/setup-buildx-action@94ab11c41e45d028884a99163086648e898eed25
7879

7980
- if: ${{ env.IS_PUBLIC_BUILD == 'true' }}
8081
name: Check out main branch
81-
uses: actions/checkout@1e204e9a9253d643386038d443f96446fa156a97
82+
uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
8283
with:
8384
ref: 'main'
8485
persist-credentials: 'false'
8586
lfs: 'true'
8687

8788
- if: ${{ env.IS_INTERNAL_BUILD == 'true' }}
8889
name: Check out PR code
89-
uses: actions/checkout@1e204e9a9253d643386038d443f96446fa156a97
90+
uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
9091
with:
9192
ref: ${{ env.COMMIT_REF }}
9293
# To prevent issues with cloning early access content later
@@ -138,7 +139,7 @@ jobs:
138139
139140
- if: ${{ env.IS_INTERNAL_BUILD == 'true' }}
140141
name: Clone docs-early-access
141-
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
142+
uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
142143
with:
143144
repository: github/docs-early-access
144145
token: ${{ secrets.DOCUBOT_REPO_PAT }}
@@ -151,7 +152,7 @@ jobs:
151152

152153
- if: ${{ env.IS_PUBLIC_BUILD == 'true' }}
153154
name: Check out user code to temp directory
154-
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
155+
uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
155156
with:
156157
path: ./user-code
157158
ref: ${{ env.COMMIT_REF }}
@@ -205,7 +206,7 @@ jobs:
205206
parameters: appName="${{ env.APP_NAME }}"
206207
containerImage="${{ env.DOCKER_IMAGE }}"
207208
dockerRegistryUrl="${{ secrets.NONPROD_REGISTRY_SERVER }}"
208-
dockerRegistryUsername="${{ secrets.NONPROD_REGISTRY_USERNAME }}"
209+
dockerRegistryUsername="${{ env.NONPROD_REGISTRY_USERNAME }}"
209210
dockerRegistryPassword="${{ secrets.NONPROD_REGISTRY_PASSWORD }}"
210211
# this shows warnings in the github actions console, because the flag is passed through a validation run,
211212
# but it *is* functional during the actual execution

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
creds: ${{ secrets.NONPROD_AZURE_CREDENTIALS }}
4040

4141
- name: Check out repo
42-
uses: actions/checkout@1e204e9a9253d643386038d443f96446fa156a97
42+
uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
4343

4444
- name: Get preview app info
4545
env:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
uses: docker/setup-buildx-action@94ab11c41e45d028884a99163086648e898eed25
5050

5151
- name: Check out repo
52-
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
52+
uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
5353
with:
5454
ref: ${{ github.sha }}
5555
# To prevent issues with cloning early access content later
@@ -66,7 +66,7 @@ jobs:
6666
cache: npm
6767

6868
- name: Clone docs-early-access
69-
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
69+
uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
7070
with:
7171
repository: github/docs-early-access
7272
token: ${{ secrets.DOCUBOT_REPO_PAT }}

.github/workflows/browser-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
35+
uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
3636
with:
3737
lfs: true
3838

@@ -54,7 +54,7 @@ jobs:
5454
run: npm ci --include=optional
5555

5656
- name: Cache nextjs build
57-
uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed
57+
uses: actions/cache@48af2dc4a9e8278b89d7fa154b955c30c6aaab09
5858
with:
5959
path: .next/cache
6060
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}

.github/workflows/check-all-english-links.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
REPORT_REPOSITORY: github/docs-content
2727
steps:
2828
- name: Check out repo's default branch
29-
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
29+
uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
3030
- name: Setup Node
3131
uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561
3232
with:
@@ -35,7 +35,7 @@ jobs:
3535
- name: npm ci
3636
run: npm ci
3737
- name: Cache nextjs build
38-
uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed
38+
uses: actions/cache@48af2dc4a9e8278b89d7fa154b955c30c6aaab09
3939
with:
4040
path: .next/cache
4141
key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
exit 1 # prevents further steps from running
4040
4141
- name: Checkout
42-
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
42+
uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
4343

4444
- name: Setup Node
4545
uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561
@@ -50,6 +50,19 @@ jobs:
5050
- name: Install Node.js dependencies
5151
run: npm ci
5252

53+
- name: Build server
54+
run: npm run build
55+
56+
- name: Start server in the background
57+
env:
58+
NODE_ENV: production
59+
PORT: 4000
60+
run: |
61+
62+
node server.mjs &
63+
sleep 5
64+
curl --retry-connrefused --retry 3 -I http://localhost:4000/
65+
5366
- name: Run broken github/github link check
5467
run: |
5568
script/check-github-github-links.js > broken_github_github_links.md

.github/workflows/code-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535
steps:
3636
- name: Check out repo
37-
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
37+
uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
3838

3939
- name: Setup node
4040
uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561

0 commit comments

Comments
 (0)