Merge branch 'master' into dev

gekware · Mar 7, 2023 · 287ab94 · 287ab94
2 parents 56327e5 + 1f3b04c
commit 287ab94
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,17 +4,26 @@
 version: 2
 updates:
     # Dependabot automatically checks for updates to any Go modules in the repository, 
-    # then creates pull requests to update them if necessary
+    # then creates pull requests to dev branch
   - package-ecosystem: "gomod"
     directory: "/"
+    target-branch: "dev"
     schedule:
-      interval: "daily"
+      interval: "weekly"
+    labels:
+      - "gomod dependencies"
+    allow:
+      - dependency-type: "all"
 
     # Dependabot checks for new versions of github actions,
     # then creates pull requests to update any outdated actions
   - package-ecosystem: "github-actions"
     directory: "/"
+    target-branch: "master"
     schedule:
       interval: "weekly"
-
-
+    labels:
+      - "github_actions"
+    allow:
+      - dependency-type: "all"
+
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, dev ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ master, dev ]
   schedule:
     - cron: '33 5 * * 0'