From c7cfa02c41169ac8eb07fc265a47c93f4231ca07 Mon Sep 17 00:00:00 2001
From: Ivar Derksen <ivar.derksen@sidn.nl>
Date: Thu, 14 Dec 2023 15:33:27 +0100
Subject: [PATCH] CI/CD: fix failing codeql analyze workflow

---
 .github/workflows/codeql-analysis.yml | 30 ---------------------------
 .github/workflows/status-checks.yml   | 24 ++++++++++++++++++++-
 .github/workflows/weekly-checks.yml   | 14 -------------
 3 files changed, 23 insertions(+), 45 deletions(-)
 delete mode 100644 .github/workflows/codeql-analysis.yml
 delete mode 100644 .github/workflows/weekly-checks.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index 051c0b1..0000000
--- a/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: "CodeQL"
-
-on:
-  workflow_call:
-
-jobs:
-  codeql-analyze:
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ^1.18
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: go
-          queries: +security-and-quality
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/status-checks.yml b/.github/workflows/status-checks.yml
index 782296b..0a49cfc 100644
--- a/.github/workflows/status-checks.yml
+++ b/.github/workflows/status-checks.yml
@@ -61,4 +61,26 @@ jobs:
   analyze:
     # Require successful test to make sure analysis does not fail on syntax errors.
     needs: test
-    uses: ./.github/workflows/codeql-analysis.yml
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: go.mod
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: go
+          queries: +security-and-quality
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/weekly-checks.yml b/.github/workflows/weekly-checks.yml
deleted file mode 100644
index 9bcafe2..0000000
--- a/.github/workflows/weekly-checks.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Checks to weekly monitor the status of master.
-name: Weekly checks
-
-on:
-  schedule:
-    # Run every monday on 9:00 in the morning (UTC).
-    - cron: "0 9 * * 1"
-  # Make it possible to trigger the checks manually.
-  workflow_dispatch:
-
-jobs:
-
-  analyze:
-    uses: ./.github/workflows/codeql-analysis.yml