Merge dependabot/npm_and_yarn/ui/web/vue/eslint-config-typescript-12.0.0 into combine...

[e-mobility-charging-stations-simulator.git] / .github / workflows / codeql-analysis.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 652298c6a55a400fca631e99c0745900c3a6c4fc..2c3d249437db6b5f5ef581bb29cb488ae0dd2486 100644 (file)
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,12 @@ name: 'CodeQL'
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [master]
+    branches: [main]
+  # merge_group:
+  #   branches: [main]
   schedule:
     - cron: '17 15 * * 1'
 
@@ -39,7 +41,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL