From 6d064e4d1e116ef00b393dd52b5ded6ff08e2baa Mon Sep 17 00:00:00 2001
From: Toby Bellwood <toby.bellwood@amazee.io>
Date: Tue, 29 Oct 2024 11:59:52 +1100
Subject: [PATCH] chore: create versioned branch

---
 .github/workflows/merge-branch.yaml |  4 ++--
 renovate.json                       | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/merge-branch.yaml b/.github/workflows/merge-branch.yaml
index bec4669..1654a48 100644
--- a/.github/workflows/merge-branch.yaml
+++ b/.github/workflows/merge-branch.yaml
@@ -9,10 +9,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Merge main -> php81
+      - name: Merge main -> versioned
         uses: devmasx/merge-branch@master
         with:
           type: now
           from_branch: main
-          target_branch: php81
+          target_branch: versioned
           github_token: ${{ github.token }}
diff --git a/renovate.json b/renovate.json
index 935240a..ea66169 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,6 +1,7 @@
 {
   "baseBranches": [
-    "main"
+    "main",
+    "versioned"
   ],
   "extends": ["config:base"],
   "automerge": true,
@@ -11,6 +12,7 @@
     {
       "datasources": ["packagist"],
       "updateTypes": ["patch", "minor"],
+      "matchBaseBranches": ["main"],
       "packageNames": [
         "drupal/core-dev-pinned",
         "drupal/core-recommended",
@@ -22,6 +24,7 @@
     {
       "datasources": ["packagist"],
       "updateTypes": ["major"],
+      "matchBaseBranches": ["main"],
       "packageNames": [
         "drupal/core-dev-pinned",
         "drupal/core-recommended",
@@ -32,7 +35,13 @@
     },
     {
       "matchManagers": ["github-actions"],
+      "matchBaseBranches": ["main"],
       "groupName": "GitHub actions"
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchBaseBranches": ["versioned"],
+      "versioning": "semver"
     }
   ]
 }