Merge branch 'main' into resource-cleanup

18F · Nov 30, 2023 · 65d2e71 · 65d2e71
2 parents 7db5acf + 8efdd11
commit 65d2e71
Show file tree

Hide file tree

Showing 85 changed files with 2,918 additions and 7,724 deletions.
diff --git a/.github/workflows/on_dependabot_auto_approve.yml b/.github/workflows/on_dependabot_auto_approve.yml
@@ -1,6 +1,6 @@
 name: auto-approve dependabot PRs
 
-on: 
+on:
   pull_request_target:
 
 jobs:
@@ -11,6 +11,6 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@af513c7a016048ae468971c52ed77d9562c7c819
+      - uses: actions/checkout@v4
       - run: gh pr review "$GITHUB_HEAD_REF" --approve
       - run: gh pr merge "$GITHUB_HEAD_REF" --auto --squash
diff --git a/.github/workflows/on_pull_request_inclusion_bot_sync.yml b/.github/workflows/on_pull_request_inclusion_bot_sync.yml
@@ -22,24 +22,24 @@ jobs:
           installation_id: ${{ secrets.APP_INSTALLATION_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Use the branch commit instead of the PR merge commit
           ref: ${{ github.event.pull_request.head.ref }}
           # Use app credentials for the token, so that any commits generated by
           # this job will trigger a rebuild, so the thing can be merged
           token: ${{ steps.app_token.outputs.token }}
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - run: npm ci
 
       - run: npx -y prettier -w InclusionBot.md
       - run: node sync-inclusion-bot-words.js
 
       - if: failure()
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             github.rest.issues.createComment({
@@ -53,15 +53,15 @@ jobs:
       # in the diff, or non-zero if anything has changed.
       - run: if git diff --exit-code --quiet; then echo "::set-output name=changes::no"; else echo "::set-output name=changes::yes"; fi
         id: diff
-      
+
       # If anything changed, commit it.
       - if: steps.diff.outputs.changes == 'yes'
         uses: EndBug/add-and-commit@v9
         with:
           message: synchronize word lists
-      
+
       - if: steps.diff.outputs.changes == 'yes'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             github.rest.issues.createComment({
@@ -70,4 +70,3 @@ jobs:
               repo: context.repo.repo,
               body: `The Inclusion Bot word lists have been synchronized. @${context.actor}, please pull the last commit before pushing any more changes to this branch.`
             });
-
diff --git a/.github/workflows/on_pull_request_tock_ops.yml b/.github/workflows/on_pull_request_tock_ops.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/github-script@9ac08808f993958e9de277fe43a64532a609130e
+      - uses: actions/github-script@v7
         with:
           script: |
             github.rest.issues.createComment({

diff --git a/.github/workflows/on_push_main.yml b/.github/workflows/on_push_main.yml
@@ -1,39 +1,39 @@
 name: push to main
 
-on: 
+on:
   push:
     branches:
       - main
 
 jobs:
   build:
     uses: ./.github/workflows/reusable_build.yml
-  
+
   test:
     needs: [build]
     uses: ./.github/workflows/reusable_test.yml
-  
+
   deploy:
     needs: [test]
     uses: ./.github/workflows/reusable_deploy.yml
     with:
       environment: prod
     secrets: inherit
-  
+
   release:
     name: publish release
     needs: [deploy]
     runs-on: ubuntu-latest
-    container: node:18
+    container: node:20
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@af513c7a016048ae468971c52ed77d9562c7c819
-      - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v3
         with:
           path: ./node_modules
           key: 18f-bot-${{ runner.os }}-${{ hashFiles('package.json') }}-v1
-      - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
+      - uses: actions/cache@v3
         id: npmcache
         with:
           path: ./npm-cache
@@ -50,7 +50,7 @@ jobs:
         id: hash
         run: |
           echo "::set-output name=sha::$(shasum -a 256 ${{ steps.zip.outputs.zip_path }} | cut -d' ' -f1)"
-      - uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5
+      - uses: softprops/action-gh-release@v1
         with:
           files: ${{ steps.zip.outputs.zip_path }}
           name: ${{ steps.time.outputs.human }}

diff --git a/.github/workflows/on_schedule_monthly.yml b/.github/workflows/on_schedule_monthly.yml
@@ -4,17 +4,17 @@ on:
   schedule:
     # 7pm UTC, 15th of every month
     # Scheduled to hopefully be during TTS business days most of the time
-    - cron: '0 19 15 * *'
+    - cron: "0 19 15 * *"
 
 jobs:
   lts-check:
     name: current LTS check
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@1e204e9a9253d643386038d443f96446fa156a97
-      - uses: actions/setup-node@2fddd8803e2f5c9604345a0b591c3020ee971a93
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
-      
+          node-version: 20
+
       - run: node lts.js
diff --git a/.github/workflows/reusable_build.yml b/.github/workflows/reusable_build.yml
@@ -1,21 +1,21 @@
 name: build charlie
 
-on: 
+on:
   workflow_call:
 
 jobs:
   build:
     name: build
     runs-on: ubuntu-latest
-    container: node:18
+    container: node:20
     steps:
-      - uses: actions/checkout@af513c7a016048ae468971c52ed77d9562c7c819
-      - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v3
         id: depcache
         with:
           path: ./node_modules
           key: 18f-bot-${{ runner.os }}-${{ hashFiles('package.json') }}-v1
-      - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
+      - uses: actions/cache@v3
         id: npmcache
         with:
           path: ./npm-cache

diff --git a/.github/workflows/reusable_deploy.yml b/.github/workflows/reusable_deploy.yml
@@ -16,12 +16,12 @@ jobs:
     runs-on: ubuntu-latest
     container: governmentpaas/cf-cli
     steps:
-      - uses: actions/checkout@af513c7a016048ae468971c52ed77d9562c7c819
-      - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v3
         with:
           path: ./node_modules
           key: 18f-bot-${{ runner.os }}-${{ hashFiles('package.json') }}-v1
-      - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
+      - uses: actions/cache@v3
         id: npmcache
         with:
           path: ./npm-cache

diff --git a/.github/workflows/reusable_test.yml b/.github/workflows/reusable_test.yml
@@ -1,16 +1,16 @@
 name: test and lint
 
-on: 
+on:
   workflow_call:
 
 jobs:
   lint:
     name: lint
     runs-on: ubuntu-latest
-    container: node:18
+    container: node:20
     steps:
-      - uses: actions/checkout@af513c7a016048ae468971c52ed77d9562c7c819
-      - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v3
         with:
           path: ./node_modules
           key: 18f-bot-${{ runner.os }}-${{ hashFiles('package.json') }}-v1
@@ -20,10 +20,10 @@ jobs:
   format:
     name: verify formatting
     runs-on: ubuntu-latest
-    container: node:18
+    container: node:20
     steps:
-      - uses: actions/checkout@af513c7a016048ae468971c52ed77d9562c7c819
-      - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v3
         with:
           path: ./node_modules
           key: 18f-bot-${{ runner.os }}-${{ hashFiles('package.json') }}-v1
@@ -33,10 +33,10 @@ jobs:
   test:
     name: unit tests
     runs-on: ubuntu-latest
-    container: node:18
+    container: node:20
     steps:
-      - uses: actions/checkout@af513c7a016048ae468971c52ed77d9562c7c819
-      - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v3
         with:
           path: ./node_modules
           key: 18f-bot-${{ runner.os }}-${{ hashFiles('package.json') }}-v1

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18
+FROM node:20
 
 RUN mkdir /app
 WORKDIR /app

diff --git a/InclusionBot.md b/InclusionBot.md
@@ -75,6 +75,7 @@ approves your changes, they will be merged and become active in the bot.
 | grandfathered                                    | legacy<br>included retroactively                                                              | This term arose from voter restrictions that prevented Black people from voting. We want to avoid slavery and racist oppression references.<br><br>See [The Problematic Origins of Common Business Jargon](https://www.fastcompany.com/90239290/six-business-phrases-that-have-racist-origins) for more.                                                                                                               |
 | Goddamn, goddam, goddamnit, goddammit            | awful, terrible, wretched                                                                     | This term can be offensive or triggering to some religious traditions because it implies a deity cursing or reproaching people. We want to show respect towards all religious traditions.                                                                                                                                                                                                                              |
 | jesus fucking, fucking christ                    | Wow, oh no, oh my                                                                             | We want to show respect towards all religious traditions.                                                                                                                                                                                                                                                                                                                                                              |
+| mumbo jumbo                                      | jargon, confusing language                                                                    | The term "mumbo jumbo" was used to stereotype African languages and cultures that didn't make sense to European colonizers. <br><br> See [Here are some commonly used terms that actually have racist origins](https://abcnews.go.com/Politics/commonly-terms-racist-origins/story?id=71840410) for more.                                                                                                                                                                                                                                                                                                                                                            |
 
 # Sexist