Skip to content

Commit

Permalink
Merge pull request #22 from mallardduck/adjust-ci-names
Browse files Browse the repository at this point in the history
  • Loading branch information
mallardduck authored Nov 26, 2024
2 parents a1e9073 + 0b5ec27 commit a24d951
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"github>rancher/renovate-config#release"
],
"baseBranches": [
"main"
"main",
"/^release\\/v[0-9]+.x/"
],
"prHourlyLimit": 2
}
2 changes: 1 addition & 1 deletion .github/workflows/head-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- main
- release/v[0-9]+.0
- release/v[0-9]+.x

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit a24d951

Please sign in to comment.