From 334a64dc5cbd63ff368d5fe96fd22e7df79970a1 Mon Sep 17 00:00:00 2001
From: akastav <switch@bk.ru>
Date: Wed, 17 Mar 2021 15:06:40 +0300
Subject: [PATCH] include sonar scan to backend build job

---
 .github/workflows/backend.yml | 13 +++++++++++--
 .github/workflows/sonar.yaml  | 36 -----------------------------------
 2 files changed, 11 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/sonar.yaml

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index eb4ecb35a6..fa7c4381b3 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -23,5 +23,14 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.13
-    - name: Build with Maven
-      run: mvn clean package -Pprod
+    - name: Cache SonarCloud packages
+      uses: actions/cache@v1
+      with:
+        path: ~/.sonar/cache
+        key: ${{ runner.os }}-sonar
+        restore-keys: ${{ runner.os }}-sonar
+    - name: Build and analyze
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar    
\ No newline at end of file
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
deleted file mode 100644
index 13e35aa1e9..0000000000
--- a/.github/workflows/sonar.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Build
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [opened, synchronize, reopened]
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-      - name: Cache Maven packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-      - name: Build and analyze
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar