Skip to content

Updated workflow according to new rules #913

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.

Sign up for GitHub

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

Merged
dkrasnoff merged 1 commit into from
Jan 9, 2026
Merged

Updated workflow according to new rules #913

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions docs/workflow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,11 @@ This block describes working on a new feature flow.
This block describes the process of releasing a new version.
[More about Kotlin release types.](https://kotlinlang.org/docs/releases.html)
1. Create a branch with the version name:
* if it is a `bug fix` or `tooling` release create branch from the previous release branch
* if it is `language` release version (`Beta*` and `RC*` are included):
* if specific `kotlin-community/<stable-version>` branch exists, create branch from it
* otherwise:
* for `Beta*` version create new branch from `kotlin-community/dev` branch
* for `RC*` and stable versions create a branch from the previous release branch within that version line.
* if your current release version has `-Beta1` postfix, then create the branch from the previous `kotlin-community/<version>-Beta1`
* if your current release version has any other postfix or no postfix at all, then create the branch
* from the `kotlin-community/<version>` branch, if not exists then
* from the `kotlin-community/<previous-version>` branch, if it does not exist then
* from the `<previous-version>` branch.
2. Modify [the Kotlin version](https://github.com/JetBrains/kotlin-compiler-server/blob/master/gradle/libs.versions.toml#L2) in the branch.
3. If the current Kotlin version is bigger than in `master`, then create a pull request to `master`. Otherwise, push your changes to the remote branch and skip the rest of the steps.
* creating a pull request should be from the separate branch like `merge/2.0.0-RC2`
Expand All @@ -68,4 +67,5 @@ This block describes the process of releasing a new version.
5. After review approval: move the task to `Ready for Deploy` state in YouTrack.
6. After all tests are passed, merge the branch to `<version>`.
7. Wait until the [deployment on TeamCity](https://buildserver.labs.intellij.net/buildConfiguration/Kotlin_KotlinSites_Deployments_PlayKotlinlangOrg_Backend_DeployWithPulumi?branch=%3Cdefault%3E&buildTypeTab=overview#all-projects) is completed (it will appear not immediately)
8. Move task to `Fixed` state in YouTrack.
8. Move task to `Fixed` state in YouTrack.
9. (Optional) If you want to have hotfix not only in this branch but also in all subsequent versions, then create hotfixes for all future `<version>` branches, all future `kotlin-community/<version>` branches and `kotlin-community/dev`.