repo sync

Author: Octomerger

.github/workflows/browser-test.yml

@@ -20,22 +20,18 @@ jobs:
           paths: '[".github/workflows/browser-test.yml","assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]'
   build:
     needs: see_if_should_skip
+    if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-      # Each of these ifs needs to be repeated at each step to make sure the required check still runs
-      # Even if if doesn't do anything
-      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
-      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Install
+      - name: Install
         uses: ianwalter/puppeteer@12728ddef82390d1ecd4732fb543f62177392fbb
         with:
           args: npm ci
 
-      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Test
+      - name: Test
         uses: ianwalter/puppeteer@12728ddef82390d1ecd4732fb543f62177392fbb
         with:
           args: npm run browser-test

.github/workflows/test.yml

@@ -31,50 +31,42 @@ jobs:
 
   test:
     needs: see_if_should_skip
+    if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
         test-group: [content, meta, rendering, routing, unit, links-and-images]
     steps:
-      # Each of these ifs needs to be repeated at each step to make sure the required check still runs
-      # Even if if doesn't do anything
-      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Check out repo
+      - name: Check out repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
-      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Setup node
+      - name: Setup node
         uses: actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d
         with:
           node-version: 14.x
 
-      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Get npm cache directory
+      - name: Get npm cache directory
         id: npm-cache
         run: |
           echo "::set-output name=dir::$(npm config get cache)"
 
-      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Cache node modules
+      - name: Cache node modules
         uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
         with:
           path: ${{ steps.npm-cache.outputs.dir }}
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
 
-      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Install dependencies
+      - name: Install dependencies
         run: npm ci
 
-      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Run build script
+      - name: Run build script
         run: npm run build
 
-      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Run tests
+      - name: Run tests
         run: npx jest tests/${{ matrix.test-group }}/
         env:
           NODE_OPTIONS: "--max_old_space_size=4096"

data/glossaries/external.yml

@@ -60,9 +60,9 @@
 - term: branch
   description: >-
     A branch is a parallel version of a repository. It is contained within the
-    repository, but does not affect the primary or master branch allowing you to
+    repository, but does not affect the primary or main branch allowing you to
     work freely without disrupting the "live" version. When you've made the
-    changes you want to make, you can merge your branch back into the master
+    changes you want to make, you can merge your branch back into the main
     branch to publish your changes.
 - term: branch restriction
   description: >-
@@ -141,8 +141,9 @@
     Short, descriptive text that accompanys a commit and communicates the change
     the commit is introducing.
 - term: compare branch
-  description: The branch you use to create a pull request. 
-    This branch is compared to the base branch you choose for the pull request, and the changes are identified. 
+  description: >-
+    The branch you use to create a pull request.
+    This branch is compared to the base branch you choose for the pull request, and the changes are identified.
     When the pull request is merged, the base branch is updated with the changes from the compare branch.
     Also known as the "head branch" of the pull request.
 - term: continuous integration
@@ -395,12 +396,18 @@
     Markdown and uses a particular form of Markdown called GitHub Flavored Markdown. See [GitHub Flavored Markdown Spec](https://github.github.com/gfm/) or [Getting started with writing and formatting on GitHub](/articles/getting-started-with-writing-and-formatting-on-github).
 - term: Markup
   description: A system for annotating and formatting a document.
-- term: master
+- term: main
   description: >-
     The default development branch. Whenever you create a Git repository, a
-    branch named "master" is created, and becomes the active branch. In most
+    branch named "main" is created, and becomes the active branch. In most
     cases, this contains the local development, though that is purely by
     convention and is not required.
+- term: master
+  description: >-
+    The default branch in many Git repositories. By default, when you create 
+    a new Git repository on the command line a branch called `master` is created. 
+    Many tools now use an alternative name for the default branch. For example, 
+    when you create a new repository on GitHub the default branch is called `main`.
 - term: Members graph
   description: A repository graph that shows all the forks of a repository.
 - term: mention