From 906a3dcf741ffe6592860dedc3e2d0ee58b734fa Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Fri, 19 Jan 2024 22:30:54 +0000
Subject: [PATCH 1/2] ci/codeql: Put the ignored paths directly into the
 workflow

https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#specifying-configuration-details-using-the-config-input
---
 .github/codeql/codeql-config.yml      | 2 --
 .github/workflows/codeql-analysis.yml | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 .github/codeql/codeql-config.yml

diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
deleted file mode 100644
index af5879d427096..0000000000000
--- a/.github/codeql/codeql-config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-paths-ignore:
-  - Library/Homebrew/vendor/
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 9e60a4238c537..bec5d1f881fcd 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -25,7 +25,9 @@ jobs:
      uses: github/codeql-action/init@v3
      with:
        languages: ruby
-       config-file: ./.github/codeql/codeql-config.yml
+       config: |
+        paths-ignore:
+          - Library/Homebrew/vendor
 
    - name: Perform CodeQL Analysis
      uses: github/codeql-action/analyze@v3

From ab7b3e2909bbbf5c50cac68c4cf65f859947ce87 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Fri, 19 Jan 2024 22:34:06 +0000
Subject: [PATCH 2/2] ci/codeql: Fix inconsistent indentation

---
 .github/workflows/codeql-analysis.yml | 50 +++++++++++++--------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index bec5d1f881fcd..890e146e7289a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,33 +1,33 @@
 name: "CodeQL"
 
 on:
- push:
-   branches:
-     - master
- pull_request:
-   branches:
-     - master
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
- analyze:
-   name: Analyze
-   runs-on: ubuntu-22.04
-   permissions:
-     actions: read
-     contents: read
-     security-events: write
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-22.04
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
 
-   steps:
-   - name: Checkout repository
-     uses: actions/checkout@v4
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-   - name: Initialize CodeQL
-     uses: github/codeql-action/init@v3
-     with:
-       languages: ruby
-       config: |
-        paths-ignore:
-          - Library/Homebrew/vendor
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ruby
+          config: |
+            paths-ignore:
+              - Library/Homebrew/vendor
 
-   - name: Perform CodeQL Analysis
-     uses: github/codeql-action/analyze@v3
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3