From 19915c08fc7ff10eae0fa64f28fa0f92309bcf11 Mon Sep 17 00:00:00 2001
From: Fritz Ray <fritz.ray@eduworks.com>
Date: Mon, 23 Sep 2024 09:02:10 -0700
Subject: [PATCH] CI

---
 .../{codeql-analysis.yml => build.yml}        | 14 ++++-
 .github/workflows/sonarcloud.yml              | 63 -------------------
 2 files changed, 12 insertions(+), 65 deletions(-)
 rename .github/workflows/{codeql-analysis.yml => build.yml} (81%)
 delete mode 100644 .github/workflows/sonarcloud.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/build.yml
similarity index 81%
rename from .github/workflows/codeql-analysis.yml
rename to .github/workflows/build.yml
index 715af45d..f0af82a2 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/build.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master,"1.5","1.6" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ master,"1.5","1.6" ]
   schedule:
     - cron: '16 9 * * 1'
 
@@ -68,3 +68,13 @@ jobs:
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
+      
+    - name: Analyze with SonarCloud
+      uses: SonarSource/sonarcloud-github-action@latest
+      env:
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}   # Generate a token on Sonarcloud.io, add it to the secrets of this repo with the name SONAR_TOKEN (Settings > Secrets > Actions > add new repository secret)
+      with:
+        args:
+          -Dsonar.projectKey=cassproject_cass-npm
+          -Dsonar.organization=cassproject
+        projectBaseDir: .
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
deleted file mode 100644
index 19fe8902..00000000
--- a/.github/workflows/sonarcloud.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-# This workflow helps you trigger a SonarCloud analysis of your code and populates
-# GitHub Code Scanning alerts with the vulnerabilities found.
-# Free for open source project.
-
-# 1. Login to SonarCloud.io using your GitHub account
-
-# 2. Import your project on SonarCloud
-#     * Add your GitHub organization first, then add your repository as a new project.
-#     * Please note that many languages are eligible for automatic analysis,
-#       which means that the analysis will start automatically without the need to set up GitHub Actions.
-#     * This behavior can be changed in Administration > Analysis Method.
-#
-# 3. Follow the SonarCloud in-product tutorial
-#     * a. Copy/paste the Project Key and the Organization Key into the args parameter below
-#          (You'll find this information in SonarCloud. Click on "Information" at the bottom left)
-#
-#     * b. Generate a new token and add it to your Github repository's secrets using the name SONAR_TOKEN
-#          (On SonarCloud, click on your avatar on top-right > My account > Security
-#           or go directly to https://sonarcloud.io/account/security/)
-
-# Feel free to take a look at our documentation (https://docs.sonarcloud.io/getting-started/github/)
-# or reach out to our community forum if you need some help (https://community.sonarsource.com/c/help/sc/9)
-
-name: SonarCloud analysis
-
-on:
-  push:
-    branches: [ "master","1.5","1.6" ]
-  pull_request:
-    branches: [ "master","1.5","1.6" ]
-
-permissions:
-  pull-requests: read # allows SonarCloud to decorate PRs with analysis results
-
-jobs:
-  Analysis:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Analyze with SonarCloud
-
-        # You can pin the exact commit or the version.
-        # uses: SonarSource/sonarcloud-github-action@v2.2.0
-        uses: SonarSource/sonarcloud-github-action@4006f663ecaf1f8093e8e4abb9227f6041f52216
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}   # Generate a token on Sonarcloud.io, add it to the secrets of this repo with the name SONAR_TOKEN (Settings > Secrets > Actions > add new repository secret)
-        with:
-          args:
-            # Unique keys of your project and organization. You can find them in SonarCloud > Information (bottom-left menu)
-            # mandatory
-            -Dsonar.projectKey=cassproject_cass-npm
-            -Dsonar.organization=cassproject
-            # Comma-separated paths to directories containing test source files.
-            #-Dsonar.tests=src/**.test.js # optional. For more info about Code Coverage, please refer to https://docs.sonarcloud.io/enriching/test-coverage/overview/
-            # Adds more detail to both client and server-side analysis logs, activating DEBUG mode for the scanner, and adding client-side environment variables and system properties to the server-side log of analysis report processing.
-            #-Dsonar.verbose= # optional, default is false
-          # When you need the analysis to take place in a directory other than the one from which it was launched, default is .
-          projectBaseDir: .