From 9befb0455fc6b393bffc5829bcbcf9b531256bac Mon Sep 17 00:00:00 2001
From: Allison Piper <alliepiper16@gmail.com>
Date: Fri, 17 May 2024 15:54:53 -0400
Subject: [PATCH 1/2] Merge prep jobs for verify-devcontainers CI. (#1754)

[skip-tests]
---
 .github/workflows/verify-devcontainers.yml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/verify-devcontainers.yml b/.github/workflows/verify-devcontainers.yml
index bc6914ae04..b17045f3d9 100644
--- a/.github/workflows/verify-devcontainers.yml
+++ b/.github/workflows/verify-devcontainers.yml
@@ -11,8 +11,10 @@ permissions:
   contents: read
 
 jobs:
-  verify-make-devcontainers:
+  get-devcontainer-list:
     name: Verify devcontainer files are up-to-date
+    outputs:
+      devcontainers: ${{ steps.get-list.outputs.devcontainers }}
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
@@ -36,16 +38,6 @@ jobs:
         else
           echo "::note::Dev Container files are up-to-date."
         fi
-
-  get-devcontainer-list:
-    needs: verify-make-devcontainers
-    name: Get list of devcontainer.json files
-    runs-on: ubuntu-latest
-    outputs:
-      devcontainers: ${{ steps.get-list.outputs.devcontainers }}
-    steps:
-    - name: Check out the code
-      uses: actions/checkout@v3
     - name: Get list of devcontainer.json paths and names
       id: get-list
       run: |

From 0e350f631ed43c3b38fd838b210f3226bdfb624a Mon Sep 17 00:00:00 2001
From: Allison Piper <alliepiper16@gmail.com>
Date: Mon, 20 May 2024 05:58:58 -0400
Subject: [PATCH 2/2] Fix typo in ci docs. (#1756)

[skip-tests]
---
 ci-overview.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-overview.md b/ci-overview.md
index 19bae3f4a0..b9cb2acc2a 100644
--- a/ci-overview.md
+++ b/ci-overview.md
@@ -38,7 +38,7 @@ Special commands are provided that can be included in commit messages to direct
 
 Use these commands judiciously. While they offer flexibility, they should be used appropriately to maintain the codebase's integrity and quality.
 
-### Temporarily Overriding the Pull Requeest Matrix
+### Temporarily Overriding the Pull Request Matrix
 
 If a workflow named `override` exists in the matrix.yaml file, this matrix will be used for pull requests instead of the `pull_request` matrix.
 This is useful for reducing resource usage when launching many CI workflows from a PR (for example, while testing CI features).