From 0b5ec27e7e28aea12e79018bdf0f2d4634bbe1b2 Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Tue, 26 Nov 2024 16:55:55 -0500 Subject: [PATCH] adjust ci branch names --- .github/renovate.json | 3 ++- .github/workflows/head-build.yml | 2 +- README.md | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index fa3efcb..b0cb417 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -3,7 +3,8 @@ "github>rancher/renovate-config#release" ], "baseBranches": [ - "main" + "main", + "/^release\\/v[0-9]+.x/" ], "prHourlyLimit": 2 } diff --git a/.github/workflows/head-build.yml b/.github/workflows/head-build.yml index d599bff..b4b3e04 100644 --- a/.github/workflows/head-build.yml +++ b/.github/workflows/head-build.yml @@ -4,7 +4,7 @@ on: push: branches: - main - - release/v[0-9]+.0 + - release/v[0-9]+.x concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/README.md b/README.md index 4bfa2e5..09a03ee 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,11 @@ This repo produces a Rancher specific version of the `flavio/kuberlr` image. - Each release pre-bundles all necessary [kubectl](https://github.com/rancher/kubectl) versions supported by the Rancher version the release supports. ## Branches, Releases, and Rancher -| Branch | Release Tag | Rancher Tag (Branch) | -|-------------------|---------------|----------------------| -| main (release/v3) | head (v3.Y.Z) | 2.10.Z (main) | -| release/v2 | v2.Y.Z | 2.9.Z (release/v2.9) | -| release/v1 | v1.Y.Z | 2.8.Z (release/v2.8) | +| Branch | Release Tag | Rancher Tag (Branch) | +|---------------------|---------------|----------------------| +| main (release/v3.x) | head (v3.Y.Z) | 2.10.Z (main) | +| release/v2.x | v2.Y.Z | 2.9.Z (release/v2.9) | +| release/v1.x | v1.Y.Z | 2.8.Z (release/v2.8) | ### Notes: - Each minor Rancher release will get a `rancher/kuberlr-kubectl` branch: