From 15a6eb9297e1e25fc5a2729e8c9f61dac7845128 Mon Sep 17 00:00:00 2001
From: lsocha <lsocha@box.com>
Date: Tue, 10 Nov 2026 17:13:57 +0100
Subject: [PATCH 1/3] ci: Pin Java 17 for CodeQL builds (SDK-7017)

---
 .github/workflows/codeql.yml | 40 ++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 .github/workflows/codeql.yml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000..378a0716d
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,40 @@
+name: CodeQL
+on:
+  push:
+    branches:
+      - combined-sdk
+  pull_request:
+    branches:
+      - combined-sdk
+
+permissions:
+  contents: read
+
+jobs:
+  analyze:
+    name: Analyze (java-kotlin)
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v4
+        with:
+          languages: java-kotlin
+          build-mode: manual
+      - name: Build
+        run: ./gradlew --no-daemon clean classes testClasses intTestClasses exampleClasses --stacktrace
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v4
+        with:
+          category: '/language:java-kotlin'

From e202c5d882542d71f1f97de6b650255a5b5e1445 Mon Sep 17 00:00:00 2001
From: lsocha <lsocha@box.com>
Date: Thu, 12 Nov 2026 14:32:21 +0100
Subject: [PATCH 2/3] ci: Retrigger CodeQL (SDK-7017)


From 3b6649fde067744458e2f24fe70ebd84a6222a38 Mon Sep 17 00:00:00 2001
From: lsocha <lsocha@box.com>
Date: Thu, 12 Nov 2026 14:35:09 +0100
Subject: [PATCH 3/3] ci: Scan GitHub Actions workflows with CodeQL too
 (SDK-7017)

---
 .github/workflows/codeql.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 378a0716d..faefbd26b 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -12,16 +12,25 @@ permissions:
 
 jobs:
   analyze:
-    name: Analyze (java-kotlin)
+    name: Analyze (${{ matrix.language }})
     runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: read
       security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: actions
+            build-mode: none
+          - language: java-kotlin
+            build-mode: manual
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Java
+        if: matrix.language == 'java-kotlin'
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
@@ -30,11 +39,12 @@ jobs:
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4
         with:
-          languages: java-kotlin
-          build-mode: manual
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
       - name: Build
+        if: matrix.build-mode == 'manual'
         run: ./gradlew --no-daemon clean classes testClasses intTestClasses exampleClasses --stacktrace
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v4
         with:
-          category: '/language:java-kotlin'
+          category: '/language:${{ matrix.language }}'