Skip to content

Commit ab1ae41

Browse files
authored
Merge branch 'main' into jules-extend-ghas-enabling-docs
2 parents 5df4a59 + 3b0bec3 commit ab1ae41

766 files changed

Lines changed: 149789 additions & 147680 deletions

File tree

Some content is hidden

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

.eslintrc.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ module.exports = {
1515
},
1616
rules: {
1717
'import/no-extraneous-dependencies': ['error', { packageDir: '.' }],
18-
'node/global-require': ['error'],
19-
'import/no-dynamic-require': ['error'],
2018
},
2119
overrides: [
2220
{

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Set default behaviour, in case users don't have core.autocrlf set.
22
* text=auto
3-
43
# Explicitly declare text files we want to always be normalized and converted
54
# to native line endings on checkout.
65
*.md text
6+
*.json.br filter=lfs diff=lfs merge=lfs -text

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
/.github/ @github/docs-engineering
1111
/script/ @github/docs-engineering
1212
/includes/ @github/docs-engineering
13-
/layouts/ @github/docs-engineering
1413
app.json @github/docs-engineering
1514
Dockerfile @github/docs-engineering
1615
package-lock.json @github/docs-engineering

.github/actions-scripts/create-enterprise-issue.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env node
22

3-
import fs from 'fs'
3+
import fs from 'fs/promises'
44
import path from 'path'
55
import { getOctokit } from '@actions/github'
66
import enterpriseDates from '../../lib/enterprise-dates.js'
@@ -74,7 +74,7 @@ async function run() {
7474
process.exit(0)
7575
}
7676

77-
const milestoneSteps = fs.readFileSync(
77+
const milestoneSteps = await fs.readFile(
7878
path.join(
7979
process.cwd(),
8080
`.github/actions-scripts/enterprise-server-issue-templates/${milestone}-issue.md`

.github/actions-scripts/enterprise-algolia-label.js renamed to .github/actions-scripts/enterprise-search-label.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/usr/bin/env node
22

3-
import fs from 'fs'
3+
import fs from 'fs/promises'
44
import { setOutput } from '@actions/core'
55

6-
const eventPayload = JSON.parse(fs.readFileSync(process.env.GITHUB_EVENT_PATH, 'utf8'))
6+
const eventPayload = JSON.parse(await fs.readFile(process.env.GITHUB_EVENT_PATH, 'utf8'))
77

88
// This workflow-run script does the following:
99
// 1. Gets an array of labels on a PR.
10-
// 2. Finds one with the relevant Algolia text; if none found, exits early.
10+
// 2. Finds one with the relevant search text; if none found, exits early.
1111
// 3. Gets the version substring from the label string.
1212

1313
const labelText = 'sync-english-index-for-'
@@ -19,18 +19,18 @@ if (!(labelsArray && labelsArray.length)) {
1919
}
2020

2121
// Find the relevant label
22-
const algoliaLabel = labelsArray
22+
const searchLabel = labelsArray
2323
.map((label) => label.name)
2424
.find((label) => label.startsWith(labelText))
2525

2626
// Exit early if no relevant label is found
27-
if (!algoliaLabel) {
27+
if (!searchLabel) {
2828
process.exit(0)
2929
}
3030

3131
// Given: sync-english-index-for-enterprise-server@3.0
3232
// Returns: enterprise-server@3.0
33-
const versionToSync = algoliaLabel.split(labelText)[1]
33+
const versionToSync = searchLabel.split(labelText)[1]
3434

3535
// Store the version so we can access it later in the workflow
3636
setOutput('versionToSync', versionToSync)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
- PLACEHOLDER
3535
```
3636
**Note:** All of the content in this file will be updated when the release notes are created in the megabranch including the filename `PLACEHOLDER.yml`. You can update the date or leave it as-is and wait to update it when the release notes are finalized.
37-
- [ ] Create the Algolia search indices for the new release:
37+
- [ ] Create the search indices for the new release:
3838
```
3939
npm run sync-search-ghes-release
4040
```
@@ -51,7 +51,7 @@
5151
```
5252
sync-english-index-for-<PLAN@RELEASE>
5353
```
54-
☝️ This will run a workflow **on every push to the PR** that will sync **only** the English index for the new version to Algolia. This will make the GHES content searchable on staging throughout content creation, and will ensure the search updates go live at the same time the content is published. See [`contributing/search.md`](https://github.com/github/docs-internal/blob/main/contributing/search.md) for details.
54+
☝️ This will run a workflow **on every push to the PR** that will sync **only** the English index for the new version. This will make the GHES content searchable on staging throughout content creation, and will ensure the search updates go live at the same time the content is published. See [`contributing/search.md`](https://github.com/github/docs-internal/blob/main/contributing/search.md) for details.
5555
5656
- [ ] In `github/github`, to create a new GHES release follow these steps:
5757
- [ ] Copy the previous release's root document to a new root document for this release `cp app/api/description/ghes-<LATEST RELEASE NUMBER>.yaml app/api/description/ghes-<NEXT RELEASE NUMBER>.yaml`.
@@ -79,7 +79,7 @@ If the `OpenAPI dev mode check / check-schema-versions` check fails with the fol
7979
#### `Node.js tests / test content` failures
8080
8181
If the `Node.js tests / test content` check fails with the following message, the `lib/enterprise-dates.json` file is not up-to-date:
82-
> FAIL tests/content/algolia-search.js ● algolia › has remote indexNames in every language for every supported GHE version
82+
> FAIL tests/content/search.js ● search › has remote indexNames in every language for every supported GHE version
8383
8484
This file should be automatically updated, but you can also run `script/update-enterprise-dates.js` to update it. **Note:** If the test is still failing after running this script, look at the dates for this release. If the date is still inaccurate, it may be an issue with the source at https://github.com/github/enterprise-releases/blob/master/docs/supported-versions.md#release-lifecycle-dates. If that is the case, manually update the dates in the `lib/enterprise-dates.json` file.
8585
@@ -94,4 +94,4 @@ This file should be automatically updated, but you can also run `script/update-e
9494
### 🚢 🛳️ 🚢 Shipping the release branch
9595
9696
- [ ] The `github/docs-internal` repo is frozen, and the `Repo Freeze Check / Prevent merging during deployment freezes (pull_request_target)` test is expected to fail. Use admin permissions to ship the release branch with this failure.
97-
- [ ] Once smoke tests have passed, you can unfreeze the repos by deleting the `FREEZE` secret in both the `github/docs-internal` and `github/docs` repos. To delete the secrets, click the repo **Settings** tab and then click **Secrets** in the left sidebar. Click **Remove** next to the `FREEZE` secret.
97+
- [ ] Once smoke tests have passed, you can unfreeze the repos by deleting the `FREEZE` secret in both the `github/docs-internal` and `github/docs` repos. To delete the secrets, click the repo **Settings** tab and then click **Secrets** in the left sidebar. Click **Remove** next to the `FREEZE` secret.

0 commit comments

Comments
 (0)