Merge pull request #616 from mallardduck/update-ci-branches

rancher · Nov 14, 2024 · 2a75343 · 2a75343
2 parents b72bef8 + 19f91b3
commit 2a75343
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -5,9 +5,9 @@
   ],
   "baseBranches": [
     "main",
-    "release/v3.0",
-    "release/v4.0",
-    "release/v5.0"
+    "release/v6.x",
+    "release/v5.0",
+    "release/v4.0"
   ],
   "ignoreDeps": [
     "github.com/rancher/hull",

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,9 +8,7 @@ on:
   push:
     branches:
       - main
-      - release/v5.0
-      - release/v4.0
-      - release/v3.0
+      - release/v[0-9]+.(0|x)
       - release/v[0-9]+.[0-9]+.[0-9]+
     paths-ignore:
       - 'docs/**'

diff --git a/.github/workflows/head-builds.yaml b/.github/workflows/head-builds.yaml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - release/v[0-9]+.0
+      - release/v[0-9]+.(0|x)
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ This is the current branch strategy for `rancher/backup-restore-operator`, it ma
 | Branch         | Tag      | Rancher                |
 |----------------|----------|------------------------|
 | `main`         | `head`   | `main` branch (`head`) |
-| `release/v6.0` | `v6.x.x` | `v2.10.x`              |
+| `release/v6.x` | `v6.x.x` | `v2.10.x`              |
 | `release/v5.0` | `v5.x.x` | `v2.9.x`               |
 | `release/v4.0` | `v4.x.x` | `v2.8.x`               |