Merge CodeQL into main build

rjmurillo · May 31, 2024 · c69d928 · c69d928
1 parent f30377b
commit c69d928
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 21 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,6 +2,9 @@ name: Main build
 
 on:
   workflow_dispatch: # Allow running the workflow manually from the GitHub UI
+  pull_request:
+    branches:
+      - master
   push:
     branches:
       - master
@@ -52,11 +55,6 @@ jobs:
     - name: Build
       run: dotnet build --no-restore --configuration Release /bl:./artifacts/logs/release/build.release.binlog
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:csharp"
-
     - name: Test
       run: dotnet test --no-build --configuration Release
 
@@ -91,3 +89,8 @@ jobs:
     #     path: |
     #       ./artifacts/package
     #     if-no-files-found: error
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:csharp"
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml