From e4e3ca32749c8c705fefe83bbdb1d149bdc4ce2f Mon Sep 17 00:00:00 2001 From: Dmitrii Krasnov Date: Thu, 8 Jan 2026 10:27:41 +0100 Subject: [PATCH] KTL-3755 Updated workflow according to new rules with kotlin-community/* branches --- docs/workflow.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/workflow.md b/docs/workflow.md index 08ce67709..d0f431751 100644 --- a/docs/workflow.md +++ b/docs/workflow.md @@ -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/` 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/-Beta1` + * if your current release version has any other postfix or no postfix at all, then create the branch + * from the `kotlin-community/` branch, if not exists then + * from the `kotlin-community/` branch, if it does not exist then + * from the `` 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` @@ -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 ``. 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. \ No newline at end of file +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 `` branches, all future `kotlin-community/` branches and `kotlin-community/dev`. \ No newline at end of file