Skip to content

Commit f1a70c6

Browse files
committed
renovate: Use nix for v2.2 and newer release branches
Previously we configured renovate to use nix only for the main branch, since all existing release branches still used earthly. With the release-2.2 branch being cut after the switch to nix, we need to update the rule so that nix gets used for release-2.2, while earthly is still used for all older release branches. Signed-off-by: Adam Wolfe Gordon <awg@upbound.io>
1 parent 8812904 commit f1a70c6

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.github/renovate-earthly.json5

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@
6868
'go',
6969
],
7070
matchBaseBranches: [
71-
'/^release-.*/',
71+
// Release 2.1 and older use earthly.
72+
'/^release-1\..*/',
73+
'/^release-2\.[0-1]$/',
7274
],
7375
postUpgradeTasks: {
7476
commands: [
@@ -86,7 +88,9 @@
8688
'golangci/golangci-lint',
8789
],
8890
matchBaseBranches: [
89-
'/^release-.*/',
91+
// Release 2.1 and older use earthly.
92+
'/^release-1\..*/',
93+
'/^release-2\.[0-1]$/',
9094
],
9195
postUpgradeTasks: {
9296
commands: [

.github/renovate-nix.json5

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
],
2525
matchBaseBranches: [
2626
'main',
27+
// Release 2.2 and newer use nix.
28+
'/'^release-2\.([2-9]|..+)$/',
2729
],
2830
postUpgradeTasks: {
2931
commands: [
@@ -43,6 +45,8 @@
4345
],
4446
matchBaseBranches: [
4547
'main',
48+
// Release 2.2 and newer use nix.
49+
'/'^release-2\.([2-9]|..+)$/',
4650
],
4751
postUpgradeTasks: {
4852
commands: [

0 commit comments

Comments
 (0)