Skip to content

Commit 3be5a59

Browse files
authored
Merge branch 'main' into bmd/add-discussions
2 parents 2fc921b + 0694021 commit 3be5a59

75 files changed

Lines changed: 23393 additions & 28151 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.

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Order is important. The LAST matching pattern has the MOST precedence.
22
# gitignore style patterns are used, not globs.
3-
# https://help.github.com/articles/about-codeowners
3+
# https://docs.github.com/articles/about-codeowners
44
# https://git-scm.com/docs/gitignore
55

66
# Engineering

.github/workflows/build-docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
jobs:
1515
build:
1616
# Do not run this job for translations PRs
17-
if: ${{ github.ref != 'refs/heads/translations' }}
17+
if: ${{ github.head_ref != 'translations' && github.ref != 'refs/heads/translations' }}
1818

1919
runs-on: ubuntu-latest
2020
steps:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
# run: npm run heroku-postbuild
4848
# env:
4949
# DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }}
50-
# GIT_BRANCH: ${{ github.ref }}
50+
# GIT_BRANCH: ${{ github.head_ref || github.ref }}
5151

5252
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
5353
name: Build

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
# run: npm run heroku-postbuild
4848
# env:
4949
# DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }}
50-
# GIT_BRANCH: ${{ github.ref }}
50+
# GIT_BRANCH: ${{ github.head_ref || github.ref }}
5151

5252
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
5353
name: Build

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
# run: npm run heroku-postbuild
4848
# env:
4949
# DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }}
50-
# GIT_BRANCH: ${{ github.ref }}
50+
# GIT_BRANCH: ${{ github.head_ref || github.ref }}
5151

5252
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
5353
name: Build

.github/workflows/test-windows.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# NOTE: Changes to this file should also be applied to './test.yml' and './test-translations.yml'
1+
# NOTE: Changes to this file should also be applied to './test.yml'
22

33
name: Node.js Tests - Windows
44

@@ -8,17 +8,24 @@ on:
88
schedule:
99
- cron: '50 19 * * *' # once a day at 19:50 UTC / 11:50 PST
1010

11+
env:
12+
CI: true
13+
1114
jobs:
1215
test:
1316
runs-on: windows-latest
1417
if: (github.event_name != 'pull_request') || (github.event_name == 'pull_request' && (contains(github.event.pull_request.labels.*.name, 'Windows') || contains(github.event.pull_request.labels.*.name, 'windows')))
18+
timeout-minutes: 60
1519
strategy:
1620
fail-fast: false
1721
matrix:
1822
test-group: [content, graphql, meta, rendering, routing, unit]
1923
steps:
2024
- name: Check out repo
2125
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
26+
with:
27+
# Enables cloning the Early Access repo later with the relevant PAT
28+
persist-credentials: 'false'
2229

2330
- name: Setup node
2431
uses: actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e
@@ -41,7 +48,15 @@ jobs:
4148
- name: Install dependencies
4249
run: npm ci
4350

44-
- name: Run build script
51+
- if: ${{ github.repository == 'github/docs-internal' }}
52+
name: Clone early access
53+
run: npm run heroku-postbuild
54+
env:
55+
DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }}
56+
GIT_BRANCH: ${{ github.head_ref || github.ref }}
57+
58+
- if: ${{ github.repository != 'github/docs-internal' }}
59+
name: Run build script
4560
run: npm run build
4661

4762
- name: Run tests

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
run: npm run heroku-postbuild
7878
env:
7979
DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }}
80-
GIT_BRANCH: ${{ github.ref }}
80+
GIT_BRANCH: ${{ github.head_ref || github.ref }}
8181

8282
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' && github.repository != 'github/docs-internal' }}
8383
name: Run build script

content/actions/hosting-your-own-runners/about-self-hosted-runners.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ There are some limits on {% data variables.product.prodname_actions %} usage whe
6666
{% data reusables.github-actions.usage-api-requests %}
6767
- **Job matrix** - {% data reusables.github-actions.usage-matrix-limits %}
6868

69+
### Workflow continuity for self-hosted runners
70+
71+
{% data reusables.github-actions.runner-workflow-continuity %}
72+
6973
### Supported architectures and operating systems for self-hosted runners
7074

7175
The following operating systems are supported for the self-hosted runner application.
@@ -131,7 +135,12 @@ github.com
131135
api.github.com
132136
*.actions.githubusercontent.com
133137
github-releases.githubusercontent.com
138+
github-registry-files.githubusercontent.com
134139
codeload.github.com
140+
*.pkg.github.com
141+
pkg-cache.githubusercontent.com
142+
pkg-containers.githubusercontent.com
143+
pkg-containers-az.githubusercontent.com
135144
```
136145

137146
If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)" or "[Enforcing security settings in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account#using-github-actions-with-an-ip-allow-list)".

content/actions/using-github-hosted-runners/about-github-hosted-runners.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ You can specify the runner type for each job in a workflow. Each job in a workfl
3434

3535
{% data variables.product.prodname_dotcom %} hosts macOS runners in {% data variables.product.prodname_dotcom %}'s own macOS Cloud.
3636

37+
#### Workflow continuity for {% data variables.product.prodname_dotcom %}-hosted runners
38+
39+
{% data reusables.github-actions.runner-workflow-continuity %}
40+
41+
In addition, if the workflow run has been successfully queued, but has not been processed by a {% data variables.product.prodname_dotcom %}-hosted runner within 45 minutes, then the queued workflow run is discarded.
42+
3743
#### Administrative privileges of {% data variables.product.prodname_dotcom %}-hosted runners
3844

3945
The Linux and macOS virtual machines both run using passwordless `sudo`. When you need to execute commands or install tools that require more privileges than the current user, you can use `sudo` without needing to provide a password. For more information, see the "[Sudo Manual](https://www.sudo.ws/man/1.8.27/sudo.man.html)."
@@ -42,7 +48,6 @@ Windows virtual machines are configured to run as administrators with User Accou
4248

4349
### Supported runners and hardware resources
4450

45-
4651
Hardware specification for Windows and Linux virtual machines:
4752
- 2-core CPU
4853
- 7 GB of RAM memory

content/developers/webhooks-and-events/webhook-events-and-payloads.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ Only {% data variables.product.prodname_github_app %}s can receive this event. {
224224
#### Webhook payload object
225225
226226
{% data reusables.webhooks.create_properties %}
227+
{% data reusables.webhooks.pusher_type_desc %}
227228
{% data reusables.webhooks.repo_desc %}
228229
{% data reusables.webhooks.org_desc %}
229230
{% data reusables.webhooks.app_desc %}
@@ -252,6 +253,7 @@ Only {% data variables.product.prodname_github_app %}s can receive this event. {
252253
#### Webhook payload object
253254
254255
{% data reusables.webhooks.delete_properties %}
256+
{% data reusables.webhooks.pusher_type_desc %}
255257
{% data reusables.webhooks.repo_desc %}
256258
{% data reusables.webhooks.org_desc %}
257259
{% data reusables.webhooks.app_desc %}

0 commit comments

Comments
 (0)