Merge branch 'release-1.1' of https://github.com/Dynatrace/dynatrace-…

…operator into release-1.1
Dynatrace · Jun 12, 2024 · 45ac7fe · 45ac7fe
2 parents 8045595 + 65f6170
commit 45ac7fe
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -11,20 +11,23 @@
   },
   baseBranches: [
     "$default",
-    "release-0.14",
-    "release-0.15",
     "release-1.0",
+    "release-1.1",
+    "release-1.2",
   ],
   enabledManagers: [
     "regex",
     "dockerfile",
     "gomod",
     "github-actions",
+    "pip_requirements"
   ],
   postUpdateOptions: [
     "gomodTidy",
     "gomodTidy1.17",
   ],
+  automergeType: "pr",
+  automerge: true,
   regexManagers: [
     {
       fileMatch: [
@@ -35,6 +38,7 @@
         "depName=(?<depName>.*?)\\s.*?_version=(?<currentValue>.*)\\s",
       ],
       datasourceTemplate: "go",
+      automerge: "true",
     },
     {
       fileMatch: [
@@ -44,21 +48,23 @@
         "depName=(?<depName>.*?)\\s.*?version\\:\\s(?<currentValue>.*)\\s",
       ],
       datasourceTemplate: "go",
+      automerge: "true",
     },
   ],
   packageRules: [
     {
       matchBaseBranches: [
         "$default",
-        "release-0.14",
-        "release-0.15",
         "release-1.0",
+        "release-1.1",
+        "release-1.2",
       ],
       matchUpdateTypes: [
         "major",
         "minor",
       ],
       enabled: false,
+      automerge: true,
     },
     {
       matchManagers: [
@@ -70,6 +76,7 @@
       commitMessagePrefix: "Docker:",
       enabled: true,
       allowedVersions: "/^v?[0-9]+[\\.\\-][0-9]+([\\-\\.][0-9]+)*$/",
+      automerge: true,
     },
     {
       matchManagers: [
@@ -81,6 +88,7 @@
       commitMessagePrefix: "Go:",
       enabled: true,
       allowedVersions: "/^v?[0-9]+[\\.\\-][0-9]+([\\-\\.][0-9]+)*$/",
+      automerge: true,
     },
     {
       matchManagers: [
@@ -90,6 +98,7 @@
         "indirect",
       ],
       enabled: false,
+      automerge: true,
     },
     {
       matchManagers: [
@@ -100,6 +109,7 @@
       ],
       commitMessagePrefix: "Actions:",
       enabled: true,
+      automerge: true,
       allowedVersions: "/^v?[0-9]+[\\.\\-][0-9]+([\\-\\.][0-9]+)*$/",
     },
     {
@@ -111,6 +121,7 @@
       ],
       commitMessagePrefix: "Dev:",
       enabled: true,
+      automerge: true,
     },
     {
       matchPackageNames: [
@@ -119,27 +130,32 @@
       matchBaseBranches: [
         "$default",
       ],
+      automerge: true,
     },
     {
       matchPackageNames: [
         "markdownlint-cli",
       ],
       pinVersions: true,
       enabled: true,
+      automerge: true,
     },
     {
       packageNames: [
         "helm-unittest",
       ],
       enabled: true,
       pinVersions: true,
+      automerge: true,
     },
     {
       packageNames: [
         "gomarkdoc",
       ],
       enabled: true,
       pinVersions: true,
+      automerge: true,
     },
   ],
-}
+  platformAutomerge: true,
+}
diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml
@@ -14,6 +14,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        with:
+          ref: main
       - name: Install Python
         uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with: