Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always update github.com/cilium/cilium from main #2951

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -57,32 +57,6 @@
'pinDigest',
],
},
{
groupName: 'all go dependencies main',
groupSlug: 'all-go-deps-main',
matchFiles: [
'go.mod',
'go.sum',
],
postUpdateOptions: [
// update source import paths on major updates
'gomodUpdateImportPaths',
],
matchUpdateTypes: [
'major',
'minor',
'digest',
'patch',
'pin',
'pinDigest',
],
matchBaseBranches: [
'main',
],
schedule: [
'on friday',
],
},
{
// Avoid updating patch releases of golang in go.mod
enabled: 'false',
Expand All @@ -102,13 +76,6 @@
'main',
],
},
{
// Allow github.com/cilium/cilium to upgrade to prerelease versions.
ignoreUnstable: false,
matchPackageNames: [
'github.com/cilium/cilium',
],
},
{
// Images that directly use docker.io/library/golang for building.
groupName: 'golang-images',
Expand Down
21 changes: 15 additions & 6 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,37 @@ used in the commands throughout the documenat to allow copy-pasting.

export RELEASE=v0.17.1

## Update local checkout
## Create release preparation branch and PR

Update your local checkout to the latest state:

git checkout main
git pull origin main

### Update the README.md
Create the release branch:

git checkout -b pr/prepare-$RELEASE

Update `github.com/cilium/cilium` to the latest version:

go get github.com/cilium/cilium@main
go mod tidy && go mod vendor
git add go.mod go.sum vendor

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

### Create release preparation branch and open PR

git checkout -b pr/prepare-$RELEASE
git add README.md RELEASE.md
git commit -s -m "Prepare for $RELEASE release"

Push the branch to the upstream repository:

git push origin pr/prepare-$RELEASE

Then open a pull request against `main` branch. Wait for the PR to be reviewed and merged.
Then open a pull request against `main` branch. Wait for the PR to be reviewed
and merged.

## Tag a release

Expand Down
Loading