Merge branch 'main' into capital-h

Author: mattpollard

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,6 +15,7 @@ Thanks again!
 <!-- 
 - If there's an existing issue for your change, please link to it.
 - If there's _not_ an existing issue, please open one first to make it more likely that this update will be accepted: https://github.com/github/docs/issues/new/choose. -->
+**Closes [issue link]**
 
 ### What's being changed:
 

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

@@ -0,0 +1,23 @@
+# Make sure the Docker container still builds
+
+name: Build Docker image
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches-ignore:
+      - translations
+
+env:
+  CI: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+      - name: Build the container
+        run: docker build .

.github/workflows/close-external-repo-sync-prs.yml

@@ -0,0 +1,61 @@
+name: Check for External Repo Sync PR
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+    branches:
+      - main
+
+jobs:
+  invalid-repo-sync-check:
+    name: Close external Repo Sync PRs
+    if: ${{ github.repository == 'github/docs' && github.ref == 'refs/heads/repo-sync' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
+        with:
+          github-token: ${{ secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES }}
+          script: |
+
+            const prCreator = context.payload.sender.login
+
+            // If the PR creator is the expected account, stop now
+            if (prCreator === 'Octomerger') {
+              return
+            }
+
+            try {
+              await github.teams.getMembershipForUserInOrg({
+                org: 'github',
+                team_slug: 'employees',
+                username: prCreator
+              })
+
+              // If the PR creator is a GitHub employee, stop now
+              return
+            } catch (err) {
+              // An error will be thrown if the user is not a GitHub employee.
+              // That said, we still want to proceed anyway!
+            }
+
+            const pr = context.payload.pull_request
+            const { owner, repo } = context.repo
+
+            // Close the PR and add the invalid label
+            await github.issues.update({
+              owner: owner,
+              repo: repo,
+              issue_number: pr.number,
+              labels: ['invalid'],
+              state: 'closed'
+            })
+
+            // Comment on the PR
+            await github.issues.createComment({
+              owner: owner,
+              repo: repo,
+              issue_number: pr.number,
+              body: "Please leave this `repo-sync` branch to the robots!\n\nI'm going to close this pull request now, but feel free to open a new issue or ask any questions in [discussions](https://github.com/github/docs/discussions)!"
+            })

.github/workflows/test-translations.yml

@@ -17,6 +17,9 @@ jobs:
         with:
           ref: translations # check out the 'translations' branch
 
+      - name: Check out tip of main
+        run: git fetch --depth=1 origin main
+
       - name: Setup node
         uses: actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e
         with:
@@ -41,6 +44,9 @@ jobs:
       - name: Run linter
         run: npx eslint .
 
+      - name: Lint translated content
+        run: npm run lint-translation
+
       - name: Check dependencies
         run: npm run check-deps
 

.github/workflows/triage-stale-check.yml

@@ -4,17 +4,32 @@ on:
     - cron: '45 16 * * *' # Run each day at 16:45 UTC / 8:45 PST
 
 jobs:
-  stale:
+  stale_contributor:
     if: github.repository == 'github/docs'
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          stale-pr-message: 'This PR is stale because it has been open 7 days with no activity and will be automatically closed in 3 days. To keep this PR open, update the PR by adding a comment or pushing a commit.'
-          days-before-stale: 7
-          days-before-close: 10
+          stale-pr-message: 'A stale label has been added to this pull request because it has been open 7 days with no activity. To keep this PR open, add a comment or push a commit within 3 days.'
+          days-before-pr-stale: 7
+          days-before-pr-close: 3
           stale-pr-label: 'stale'
-          exempt-pr-labels: 'never-stale'
-          exempt-issue-labels: 'never-stale'
+          exempt-pr-labels: 'waiting for review'
+  stale_staff:
+    if: github.repository == 'github/docs'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-pr-message: 'This is a gentle bump for the docs team that this PR is waiting for review.'
+          days-before-pr-stale: 14
+          days-before-pr-close: -1 # Never close
+          only-labels: 'waiting for review'
+          # The hope is that by setting the stale-pr-label to the same label
+          # as the label that the stale check looks for, this will result in
+          # a comment being posted every 14 days as an infinite loop, which is what
+          # we want
+          stale-pr-label: 'waiting for review'

.github/workflows/triage-unallowed-contributions.yml

@@ -78,7 +78,7 @@ jobs:
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
-            constFilesArr = [
+            const badFilesArr = [
               'translations/**',
               'lib/rest/static/**',
               '.github/workflows/**',

.github/workflows/update-graphql-files.yml

@@ -61,9 +61,9 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branches: graphql-schema-update
-      - if: ${{ steps.create-pull-request.outputs.pr_number }}
+      - if: ${{ steps.create-pull-request.outputs.pull-request-number }}
         name: Approve
         uses: juliangruber/approve-pull-request-action@c530832d4d346c597332e20e03605aa94fa150a8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          number: ${{ steps.create-pull-request.outputs.pr_number }}
+          number: ${{ steps.create-pull-request.outputs.pull-request-number }}

Dockerfile

@@ -1,33 +1,22 @@
 # This Dockerfile can be used for docker-based deployments to platforms
 # like Now or Moda, but it is currently _not_ used by our Heroku deployments
-# It uses three multi-stage builds: `installation`, `bundles`, and the main build.
+# It uses two multi-stage builds: `install` and the main build to keep the image size down.
 
 # --------------------------------------------------------------------------------
-# INSTALLATION IMAGE
-# A temporary image that installs production-only dependencies
+# INSTALL IMAGE
+# A temporary image that installs production-only dependencies and builds the production-ready front-end bundles.
 
-FROM node:14-alpine as installation
+FROM node:14-alpine as install
+RUN apk add --no-cache python make g++
 ENV NODE_ENV production
 WORKDIR /usr/src/docs
 COPY package*.json ./
-
-# Install the project's dependencies
-RUN npm ci
-
-# --------------------------------------------------------------------------------
-# BUNDLE IMAGE
-# A temporary image that installs dependencies and builds the production-ready front-end bundles.
-
-FROM node:14-alpine as bundles
-WORKDIR /usr/src/docs
-# Install the files used to create the bundles
-COPY package*.json ./
 COPY javascripts ./javascripts
 COPY stylesheets ./stylesheets
 COPY lib ./lib
 COPY webpack.config.js ./webpack.config.js
-# Install the project's dependencies and build the bundles
-RUN npm ci && npm run build
+RUN npm ci --production
+RUN npm run build
 
 # --------------------------------------------------------------------------------
 # MAIN IMAGE
@@ -44,24 +33,31 @@ RUN chown node:node /usr/src/docs -R
 USER node
 
 # Copy our dependencies
-COPY --chown=node:node --from=installation /usr/src/docs/node_modules /usr/src/docs/node_modules
+COPY --chown=node:node --from=install /usr/src/docs/node_modules /usr/src/docs/node_modules
 
 # Copy our front-end code
-COPY --chown=node:node --from=bundles /usr/src/docs/dist /usr/src/docs/dist
+COPY --chown=node:node --from=install /usr/src/docs/dist /usr/src/docs/dist
 
 # We should always be running in production mode
 ENV NODE_ENV production
 
+# Use Lunr instead of Algolia
+ENV USE_LUNR true
+
 # Copy only what's needed to run the server
 COPY --chown=node:node assets ./assets
 COPY --chown=node:node content ./content
 COPY --chown=node:node data ./data
 COPY --chown=node:node includes ./includes
+COPY --chown=node:node layouts ./layouts
 COPY --chown=node:node lib ./lib
 COPY --chown=node:node middleware ./middleware
 COPY --chown=node:node translations ./translations
 COPY --chown=node:node server.js ./server.js
 COPY --chown=node:node package*.json ./
+COPY --chown=node:node feature-flags.json ./
 
+EXPOSE 80
 EXPOSE 443
+EXPOSE 4000
 CMD ["node", "server.js"]