Skip to content

Commit 58d2cf5

Browse files
committed
Always update github.com/cilium/cilium from main
Currently, renovate will try to update to the latest patch release, i.e. 1.17.1 at the moment but the stable branches on github.com/cilium/cilium don't contain the cilium-cli/ directory, thus breaking the build on update PRs, see e.g. #2948 Instead, we should always be vendoring the latest version from main. Drop the renovate configuration accordingly and instead update the github.com/cilium/cilium dependency upon release of a new cilium-cli version. Signed-off-by: Tobias Klauser <tobias@cilium.io>
1 parent e2d1245 commit 58d2cf5

File tree

2 files changed

+15
-39
lines changed

2 files changed

+15
-39
lines changed

.github/renovate.json5

-33
Original file line numberDiff line numberDiff line change
@@ -57,32 +57,6 @@
5757
'pinDigest',
5858
],
5959
},
60-
{
61-
groupName: 'all go dependencies main',
62-
groupSlug: 'all-go-deps-main',
63-
matchFiles: [
64-
'go.mod',
65-
'go.sum',
66-
],
67-
postUpdateOptions: [
68-
// update source import paths on major updates
69-
'gomodUpdateImportPaths',
70-
],
71-
matchUpdateTypes: [
72-
'major',
73-
'minor',
74-
'digest',
75-
'patch',
76-
'pin',
77-
'pinDigest',
78-
],
79-
matchBaseBranches: [
80-
'main',
81-
],
82-
schedule: [
83-
'on friday',
84-
],
85-
},
8660
{
8761
// Avoid updating patch releases of golang in go.mod
8862
enabled: 'false',
@@ -102,13 +76,6 @@
10276
'main',
10377
],
10478
},
105-
{
106-
// Allow github.com/cilium/cilium to upgrade to prerelease versions.
107-
ignoreUnstable: false,
108-
matchPackageNames: [
109-
'github.com/cilium/cilium',
110-
],
111-
},
11279
{
11380
// Images that directly use docker.io/library/golang for building.
11481
groupName: 'golang-images',

RELEASE.md

+15-6
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,37 @@ used in the commands throughout the documenat to allow copy-pasting.
2121

2222
export RELEASE=v0.17.1
2323

24-
## Update local checkout
24+
## Create release preparation branch and PR
2525

2626
Update your local checkout to the latest state:
2727

2828
git checkout main
2929
git pull origin main
3030

31-
### Update the README.md
31+
Create the release branch:
32+
33+
git checkout -b pr/prepare-$RELEASE
34+
35+
Update `github.com/cilium/cilium` to the latest version:
36+
37+
go get github.com/cilium/cilium@main
38+
go mod tidy && go mod vendor
39+
git add go.mod go.sum vendor
3240

3341
Update the *Releases* section of the `README.md` which lists all currently
3442
supported releases in a table. The version in this table needs to be updated to
3543
match the new release `$RELEASE`. Also bump `$RELEASE` in the section above, so
3644
it can be copy-pasted when preparing the next release.
3745

38-
### Create release preparation branch and open PR
39-
40-
git checkout -b pr/prepare-$RELEASE
4146
git add README.md RELEASE.md
4247
git commit -s -m "Prepare for $RELEASE release"
48+
49+
Push the branch to the upstream repository:
50+
4351
git push origin pr/prepare-$RELEASE
4452

45-
Then open a pull request against `main` branch. Wait for the PR to be reviewed and merged.
53+
Then open a pull request against `main` branch. Wait for the PR to be reviewed
54+
and merged.
4655

4756
## Tag a release
4857

0 commit comments

Comments
 (0)