Update Renovate config and workflows

FOSSBilling · Nov 22, 2023 · eda2426 · eda2426
1 parent 327b7e3
commit eda2426
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -2,25 +2,23 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:recommended",
-    "schedule:weekly"
-  ],
-  "automergeSchedule": [
-    "before 4am"
+    "schedule:weekly",
+    ":automergeDigest",
+    ":automergeLinters",
+    ":automergeMinor",
+    ":automergeRequireAllStatusChecks",
+    ":automergeTesters",
+    ":automergeTypes",
+    ":combinePatchMinorReleases",
+    ":maintainLockFilesWeekly",
+    ":prHourlyLimit2",
+    ":rebaseStalePrs"
   ],
   "lockFileMaintenance": {
     "enabled": true,
     "automerge": true
   },
-  "packageRules": [
-    {
-      "matchUpdateTypes": ["minor", "patch"],
-      "matchCurrentVersion": "!/^0/",
-      "automerge": true
-    },
-    {
-      "matchDepTypes": ["devDependencies"],
-      "matchPackagePatterns": ["lint", "prettier"],
-      "automerge": true
-    }
-  ]
+  "automergeSchedule": ["at any time"],
+  "automergeStrategy": "squash",
+  "automergeType": "branch"
 }
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -13,7 +13,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "main" ]
+    branches: 
+      - 'main'
+      - 'renovate/**'
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ "main" ]

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -5,7 +5,12 @@
 # Source repository: https://github.com/actions/dependency-review-action
 # Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
 name: 'Dependency Review'
-on: [pull_request]
+on: 
+  push:
+    branches: 
+      - 'renovate/**'
+  pull_request:
+    branches: [ "main" ]
 
 permissions:
   contents: read
@@ -18,3 +23,6 @@ jobs:
         uses: actions/checkout@v4
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v3
+        with:
+          base-ref: ${{ github.event.pull_request.base.sha || 'main' }}
+          head-ref: ${{ github.event.pull_request.head.sha || github.ref }}