chore: create versioned branch

lagoon-examples · Oct 29, 2024 · 6d064e4 · 6d064e4
1 parent 7e93fa1
commit 6d064e4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git 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
@@ -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"
     }
   ]
 }