From 8efd9516aa852e44f0230bb3b71b23d52336d84e Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Thu, 18 Jul 2024 15:34:34 +0000
Subject: [PATCH] ci: update 2 GHAs with merge_queue branch filter

---
 .github/workflows/codeql.yml      |  7 +++----
 .github/workflows/usage_guide.yml | 11 ++++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 282f4031f34..1d9bdb961da 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,7 +2,9 @@ name: "CodeQL - Python"
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - 'main'
+      - 'gh-readonly-queue/main/*'
     paths-ignore:
       - '**/tests/integration/*'
   pull_request:
@@ -11,9 +13,6 @@ on:
       - '**/tests/integration/*'
   schedule:
     - cron: "1 18 * * 0"
-  merge_group:
-    types: [checks_requested]
-    branches: [main]
 
 jobs:
   analyze:
diff --git a/.github/workflows/usage_guide.yml b/.github/workflows/usage_guide.yml
index bbdd404562b..3315fe4ebc0 100644
--- a/.github/workflows/usage_guide.yml
+++ b/.github/workflows/usage_guide.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - 'gh-readonly-queue/main/*'
   pull_request:
     branches:
       - main
@@ -39,14 +40,14 @@ jobs:
         run: |
           cd docs/usage-guide
           mdbook build
-      
+
       - name: Deploy documentation to gh-pages
         uses: JamesIves/github-pages-deploy-action@v4.5.0
         if: github.event_name == 'push'
         with:
           target-folder: usage-guide
           folder: docs/usage-guide/book
-  
+
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4.0.1
         if: github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name
@@ -54,7 +55,7 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-west-1
-      
+
       - name: Upload to S3
         if: github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name
         id: s3
@@ -63,8 +64,8 @@ jobs:
           aws s3 sync docs/usage-guide/book "s3://s2n-tls-ci-artifacts/$TARGET" --acl private --follow-symlinks
           URL="$CDN/$TARGET/index.html"
           echo "URL=$URL" >> $GITHUB_OUTPUT
-      
-      - name: Output mdbook url 
+
+      - name: Output mdbook url
         uses: ouzi-dev/commit-status-updater@v2.0.1
         if: github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name
         with: