From 439ca2b28b5faec5657f52c523e38ef16e2df532 Mon Sep 17 00:00:00 2001
From: Edgar Vonk <edgar@info.nl>
Date: Mon, 4 Nov 2024 17:25:22 +0100
Subject: [PATCH] fix: fix failing check CodeQL GitHub workflow (#1991)

Fixed check CodeQL GitHub workflow by moving the step into our existing
CodeQL workflow.

Solves PZ-4434
---
 .github/workflows/check-codeql-status.yml | 26 -----------------------
 .github/workflows/codeql.yml              | 18 ++++++++++++++++
 2 files changed, 18 insertions(+), 26 deletions(-)
 delete mode 100644 .github/workflows/check-codeql-status.yml

diff --git a/.github/workflows/check-codeql-status.yml b/.github/workflows/check-codeql-status.yml
deleted file mode 100644
index 2ffee5d2be..0000000000
--- a/.github/workflows/check-codeql-status.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# SPDX-FileCopyrightText: 2024 Lifely
-# SPDX-License-Identifier: EUPL-1.2+
-#
-
-# This workflow checks the status of the CodeQL analysis and reports the status as a check in the merge queue.
-# It is a workaround for: https://github.com/github/codeql-action/issues/1537
-# For details see: https://github.com/Eldrick19/code-scanning-status-checker
-
-check_codeql_status:
-  name: Check CodeQL Status
-  needs: analyze
-  permissions:
-    contents: read
-    checks: read
-    pull-requests: read
-
-  runs-on: ubuntu-22.04
-  if: ${{ github.event_name == 'pull_request' }}
-  steps:
-    - name: Check CodeQL Status
-      uses: eldrick19/code-scanning-status-checker@v2
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        pr_number: ${{ github.event.pull_request.number }}
-        repo: ${{ github.repository }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index d7bb13c34b..7b0270f647 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -60,3 +60,21 @@ jobs:
         uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{matrix.language}}"
+
+  check_codeql_status:
+    name: Check CodeQL Status
+    needs:
+      - analyze
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      checks: read
+      pull-requests: read
+    if: ${{ github.event_name == 'pull_request' }}
+    steps:
+      - name: Check CodeQL Status
+        uses: eldrick19/code-scanning-status-checker@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          pr_number: ${{ github.event.pull_request.number }}
+          repo: ${{ github.repository }}