Skip to content

Commit 0554084

Browse files
authored
Merge branch 'main' into classroom-starter-code-bugfix
2 parents 49cfa2b + 8dfc284 commit 0554084

188 files changed

Lines changed: 26718 additions & 28489 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/ISSUE_TEMPLATE/partner-contributed-documentation.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ Please be sure to complete all items in the checklists that follow, and feel fre
2121

2222
- [ ] Prior to submitting documentation, please apply to join the GitHub Technology Partner Program: [partner.github.com/apply](https://partner.github.com/apply?partnershipType=Technology+Partner). Please feel free to proceed once your application is approved.
2323

24+
## What information would you like to add to docs.github.com?
25+
<!-- Please explain what your proposed article is about, what customers it benefits, and any other information that would help us to prioritize this request -->
26+
2427
## Tasks
2528

2629
Please be sure to complete each of the following:

.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/move-ready-to-merge-issues.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: Move and unlabel ready to merge issues
2+
3+
# **What it does**: This moves ready to merge PRs on the project board for the open source repo. When a PR in the open source repo is labeled "ready to merge," the "waiting for review" label is removed and the PR is moved to the "Triage" column.
4+
# **Why we have it**: To help with managing our project boards.
5+
# **Who does it impact**: Open source contributors, open-source maintainers.
6+
27
on:
3-
issues:
8+
pull_request:
49
types:
510
- labeled
611

.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

app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"env": {
44
"NODE_ENV": "production",
55
"NPM_CONFIG_PRODUCTION": "true",
6-
"ENABLED_LANGUAGES": "en"
6+
"ENABLED_LANGUAGES": "en",
7+
"WEB_CONCURRENCY": "1"
78
},
89
"buildpacks": [
910
{ "url": "heroku/nodejs" }

0 commit comments

Comments
 (0)