Merge branch 'master' into dev

# Conflicts: # .github/workflows/build.yml
JvstvsHD · Oct 3, 2024 · b582928 · b582928
2 parents f685569 + 59d34e1
commit b582928
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -12,7 +12,9 @@ on:
   release:
     types: [created]
   push:
-    branches: ["**", "!dependency-updates"]
+    branches-ignore:
+      - 'renovate/**'
+      - 'dependency-updates'
 
 
 jobs:

diff --git a/renovate.json b/renovate.json
@@ -1,6 +1,6 @@
 {
   "baseBranches": [
-    "dependency-updates"
+    "dev"
   ],
   "dependencyDashboard": true,
   "labels": [