From 7b4a638cb06d40364bfdfc6e5794365ea0b79555 Mon Sep 17 00:00:00 2001
From: Silvestre Zabala <silvestre.zabala@sap.com>
Date: Fri, 22 Apr 2022 14:02:02 +0200
Subject: [PATCH 1/2] Create codeql-analysis.yml

for GHES [Code
Scanning](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning)
---
 .github/workflows/codeql-analysis.yml | 59 +++++++++++++++++++++++++++
 Makefile                              |  3 ++
 2 files changed, 62 insertions(+)
 create mode 100644 .github/workflows/codeql-analysis.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000000..cc0ef5f667
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,59 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '19 08 * * *'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go', 'java', 'javascript', 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+    - uses: ./.github/actions/setup_go
+    - uses: ./.github/actions/setup_java
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    - name: Build
+      run: |
+        make just-build
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
diff --git a/Makefile b/Makefile
index 63b7a9230e..d5db93dfe4 100644
--- a/Makefile
+++ b/Makefile
@@ -153,6 +153,9 @@ stop-db: check-db_type
 .PHONY: build
 build: init init-db test-certs scheduler autoscaler
 
+.PHONY: just-build
+just-build: init scheduler autoscaler
+
 .PHONY: integration
 integration: build
 	make -C src/autoscaler integration DBURL="${DBURL}"

From b691b41ed77384c522a721498973884845de67fa Mon Sep 17 00:00:00 2001
From: Silvestre Zabala <silvestre.zabala@sap.com>
Date: Mon, 25 Apr 2022 12:12:48 +0200
Subject: [PATCH 2/2] `make build` should just build

---
 .github/workflows/codeql-analysis.yml | 2 +-
 Makefile                              | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index cc0ef5f667..77ee82b3b3 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -53,7 +53,7 @@ jobs:
 
     - name: Build
       run: |
-        make just-build
+        make build
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
diff --git a/Makefile b/Makefile
index d5db93dfe4..54b0868ded 100644
--- a/Makefile
+++ b/Makefile
@@ -151,13 +151,10 @@ stop-db: check-db_type
 	@docker rm -f ${db_type} &> /dev/null || echo " - we could not stop and remove docker named '${db_type}'"
 
 .PHONY: build
-build: init init-db test-certs scheduler autoscaler
-
-.PHONY: just-build
-just-build: init scheduler autoscaler
+build: init scheduler autoscaler
 
 .PHONY: integration
-integration: build
+integration: build init-db test-certs
 	make -C src/autoscaler integration DBURL="${DBURL}"
 
 .PHONY: golangci-lint lint $(addprefix lint_,$(modules))