From 5ea1526e47b6d2ed0551ba2f5857d1e1ee40117b Mon Sep 17 00:00:00 2001
From: Samir Faci <samir@es.net>
Date: Fri, 6 Oct 2023 16:14:35 -0400
Subject: [PATCH] Trying matrix

---
 .github/workflows/code_scanners.yml | 39 ++++++-----------------------
 .github/workflows/go.yml            |  4 +--
 2 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/code_scanners.yml b/.github/workflows/code_scanners.yml
index 957c9289..6bb556c6 100644
--- a/.github/workflows/code_scanners.yml
+++ b/.github/workflows/code_scanners.yml
@@ -18,19 +18,12 @@ permissions:
 
 
 jobs:
-  govulncheck_job:
-    runs-on: ubuntu-latest
-    name: Run govulncheck
-    steps:
-      - id: govulncheck
-        uses: golang/govulncheck-action@v1
-        with:
-           go-version-input: "1.21.2"
-           go-package: ./...
-  security_scan:
+  code_scanning:
+    strategy:
+      matrix:
+        job_name: [security, vuln_check, lint]
+
     runs-on: ubuntu-latest
-    env:
-      GO111MODULE: on
     steps:
       - name: Checkout Source
         uses: actions/checkout@v3
@@ -42,22 +35,6 @@ jobs:
         run: sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d
       - name: Installing Go Tools
         run: ./bin/task install_tools      
-      - name: Running security scanning
-        run: ./bin/task security
-  golangci:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
-        with:
-          go-version: $GO_VERSION
-          cache: false
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          # Require: The version of golangci-lint to use.
-          # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
-          # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
-          version: v1.54
-          args: --timeout=30m
+      - name: Running Scan
+        run: ./bin/task ${{ matrix.job_name }}
+
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index dcba8a1d..6dd57fa0 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -6,14 +6,12 @@ on:
       - master
   pull_request:
 
-env:
-  GO_VERSION: 1.21.0
 
 jobs:
   test:
     strategy:
       matrix:
-        go: [ $GO_VERSION ]
+        go: [ 1.21.0 ]
         grafana: [ 8.5.22, 9.4.3, 10.1.4 ]
 
     env: