ci: run sq analysis only when push to main

TheSoftwareHouse · Apr 8, 2024 · b6be7a5 · b6be7a5
1 parent 0151744
commit b6be7a5
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 26 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,44 @@
+name: Serverless Boilerplate
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    name: Build
+    strategy:
+      matrix:
+        node-version: [20]
+
+    steps:
+      - uses: actions/checkout@v4
+      - run: cp .env.dist .env
+      - run: npm ci
+      - run: npm run lint
+      - run: npm run test-coverage
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: coverage
+          path: coverage/
+
+  sonarqube-analysis:
+    runs-on: ubuntu-latest
+    needs: tests
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Download artifact
+      uses: actions/download-artifact@v2
+      with:
+        name: coverage
+        path: coverage/
+    - name: SonarQube Scan
+      uses: sonarsource/sonarqube-scan-action@master
+      env:
+        SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,6 +1,9 @@
 name: Serverless Boilerplate
 
-on: [push]
+on:
+  push:
+    branches-ignore: 
+      - main
 
 jobs:
   tests:
@@ -15,27 +18,4 @@ jobs:
       - run: cp .env.dist .env
       - run: npm ci
       - run: npm run lint
-      - run: npm run test-coverage
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: coverage
-          path: coverage/
-
-  sonarqube-analysis:
-    runs-on: ubuntu-latest
-    needs: tests
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: Download artifact
-      uses: actions/download-artifact@v2
-      with:
-        name: coverage
-        path: coverage/
-    - name: SonarQube Scan
-      uses: sonarsource/sonarqube-scan-action@master
-      env:
-        SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      - run: npm run test
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
@@ -33,7 +33,7 @@ definitions:
 pipelines:
   default:
     - step: *compile
-    - step: *sonarqube-analysis
+
   custom:
     deploy-to-dev:
       - step: *compile
@@ -43,6 +43,9 @@ pipelines:
           name: Deploy to DEV
 
   branches:
+    main:
+      - step: *compile
+      - step: *sonarqube-analysis
     master:
       - step: *compile
       - step: