Skip to content

K
k3s
Commit 3700036f authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #18847 from caesarxuchao/release-doc

Auto commit by PR queue bot
parents 40e4ce28 fcca71f7
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
docs/devel/releasing.md
View file @ 3700036f
...@@ -46,6 +46,7 @@ release breaks down into four pieces: ...@@ -46,6 +46,7 @@ release breaks down into four pieces:
1. cutting/branching the release; 1. cutting/branching the release;
1. building and pushing the binaries; and 1. building and pushing the binaries; and
1. publishing binaries and release notes. 1. publishing binaries and release notes.
1. updating the master branch.
You should progress in this strict order. You should progress in this strict order.
...@@ -216,6 +217,15 @@ Finally, from a clone of upstream/master, *make sure* you still have ...@@ -216,6 +217,15 @@ Finally, from a clone of upstream/master, *make sure* you still have
`RELEASE_VERSION` set correctly, and run `./build/mark-stable-release.sh `RELEASE_VERSION` set correctly, and run `./build/mark-stable-release.sh
${RELEASE_VERSION}`. ${RELEASE_VERSION}`.
### Updating the master branch
If you are cutting a new release series, please also update the master branch:
change the `latestReleaseBranch` in `cmd/mungedocs/mungedocs.go` to the new
release branch (`release-X.Y`), run `hack/update-generated-docs.sh`. This will
let the unversioned warning in docs point to the latest release series. Please
send the changes as a PR titled "Update the latestReleaseBranch to release-X.Y
in the munger".
## Injecting Version into Binaries ## Injecting Version into Binaries
*Please note that this information may be out of date. The scripts are the *Please note that this information may be out of date. The scripts are the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment