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

Add a document describing release cycle and backporting criteria. #18636

Merged
merged 8 commits into from
Nov 20, 2023
Merged
Changes from 2 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
181 changes: 181 additions & 0 deletions project/RELEASES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
# Scala LTS maintenance and release cycle

## Scala LTS and Scala Next

Since Scala 3.3.0, there are always two versions of Scala 3 being developed at the same time: Scala Next and Scala LTS.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Since Scala 3.3.0, there are always two versions of Scala 3 being developed at the same time: Scala Next and Scala LTS.
Since Scala 3.3.0, there are always two versions of Scala 3 being developed at the same time: Scala LTS (currently 3.3.x) and Scala Next (will be 3.4.x, 3.5.x, and so on, until a new LTS is designated). This scheme was previously outlined in [this August 2022 blog post](https://www.scala-lang.org/blog/2022/08/17/long-term-compatibility-plans.html).


Scala Next continues all practices since before the 3.3.0. It maintains backward output (TASTy and binary) compatibility between all versions and forward output compatibility between patch releases of the same minor version. This version is being actively developed on the `main` branch. All new bug fixes and features will be merged to that version, i.e., to the `main` branch.

Scala LTS is a selected minor version (currently 3.3) that, unlike all other minor versions, has patch releases even though there is a newer minor version. Aside from our standard output compatibility guarantees, it is intended to preserve backward source compatibility. As no new features and bugfixes (with the rare exception of LTS-only hotfixes) will be developed for LTS, but instead, selected changes from the Next branch will be backported, there is no development branch for Scala LTS. All changes are merged to release branches instead. The commit marked with a full release tag for any version is the base for the release branch for the next version.

## What should be backported?

The decision of what changes merged to the `main` branch should be backported is taken according to the following flowchart:

```mermaid
flowchart TB
start(["PR relevant for LTS was merged to main branch"])
-->
cve{"Is this
a fix for a CVE?"}
Kordyjan marked this conversation as resolved.
Show resolved Hide resolved
-- yes --> ocb

subgraph "CVE"
ocb{"Does it cause
any new failures
in the full CB?"}

-- yes -->
regFix[\"Try to provide
a followup fix for
a regressions"/]

-- failure -->
debate[\"Possible workarounds
for new regressions are discussed
by the compiler team"/]

regFix -- success --> ocb
end
ocb -- no --> acc
debate -->|"decision on
the recommended
workarounds"| acc

cve -- no -->
incompat{"Does the fix
break forward
compatibiliy?"}
-- yes --> reject

incompat -- no -->

regression{"Is this a fix for
a regression present
also in LTS?"}
-- yes -->

regIsLTS{"Was the last version
not affected by
the regression released
before 3.3.0?"}
Kordyjan marked this conversation as resolved.
Show resolved Hide resolved
-- no --> ocbReg

subgraph "LTS Regression"
ocbReg{"Does it cause
any new failures
in the full CB?"}

-- yes -->
regFixReg[\"Try to provide
a followup fix for
a regressions"/]

-- failure -->
debateReg[\"Impact of both new and old regression
and possible workarounds
are discussed by the compiler team."/]

regFixReg -- success --> ocbReg
end
ocbReg -- no --> acc
debateReg -->|"decision on
the recommended
workarounds for
the new regression"| acc
debateReg -->|"decision on
the recommended
workarounds for
the old regression"| reject

regression -- no --> types
regIsLTS -- yes --> types
types{"Can the fix
change types
in any correct
Scala 3 code?"}
-- yes --> request
types -- no --> ocbOther

request{"Is backport
of the fix
heavily requested?"}
-- yes --> debateReq
request -- no --> reject

debateReq[\"Possibility of
the backport is discussed
by the compiler team"/]
--> |"backport is rejected"| reject
debateReq --> |"backport is accepted"| ocbOther

subgraph "Other Fixes"
ocbOther{"Does it cause
any new failures
in the full CB?"}

-- yes -->
regFixOther[\"Try to provide
a followup fix for
a regressions"/]
-- success --> ocbOther

ocbOther -- no -->
lint{"Does it introduce
any new warnings
behind flags?"}
-- yes -->
lintOcb{"Does it cause any
new failures in the full CB
after forcing a new flag?"}
-- yes --> regFixOther
end

lint -- no --> acc
lintOcb -- no --> acc
regFixOther -- failure --> reject

acc(["The PR is backported"])
reject(["The PR is not backported"])
```

## How should things be backported?

The backporting process is tracked by a GitHub Project in the lampepfl organization. Every PR merged to the `main` branch is automatically added to the `Needs Assessment` column. Those PRs are reviewed by the release officer or other appointed person. They can decide to remove them from the project (backport rejected) or to move them to the `Backporting in progress` column. If the PR with the backport has any differences from the original PR, the person doing the backport will ask the author and reviewers of the original change to review the backport. After merging the backport, the PR will be moved to the `Backport done` column and, after the release, to the `Released` column.

Maintainers can request backporting the entirety or a part of previously rejected PR by adding it to the `Backport requested` column.

Labels form the `backport:*` family retains their current meaning, i.e., they are used to mark things on the `main` branch that should be backported to the RC. Due to dropping the RCs for the Scala Next patch releases (more about it below), they will be only relevant for the Scala Next minor versions.
Kordyjan marked this conversation as resolved.
Show resolved Hide resolved

## The release cycle

Releasing two different lines of the language at the same time requires some changes to the release procedures. We no longer release RC versions for patch releases of Scala Next. RC versions of patch releases of Scala LTS are released two weeks before the intended full release date. RC versions of Scala Next minor releases are released four weeks before the intended full release date.
Kordyjan marked this conversation as resolved.
Show resolved Hide resolved

The releases will be performed according to the 6-week cycles. Actions of each week are started to be performed on Tuesday. This is because the compiler team meetings take place on Mondays, and some concerns might be raised during them.

If we assume that the cycle starts on Tuesday `t` and `t + 1` is the next Tuesday, the timeline looks as follows:

- `t` - release of Scala Next and RC1 for the next Scala LTS patch.
- `t + 2` - release of the next Scala LTS patch. If the next Scala Next version is a minor version, RC1 of that version is released.
- `t + 6` - the start of the new release cycle

### Dealing with delays

It is possible that there will be problems in the RC releases that require fixes and further release candidates. We will not publish a full release in the same week as an RC. This means that delay can occur.

In the case of LTS releases, there are four weeks to fix the problem if the versions is to be released before the RC1 of the next patch. If we don't solve the issue two weeks before the start of the next release cycle, we will find a commit on the release branch of the current version that the problem was not yet present and release it as an RC. Before releasing the RC1 for the next version, we will either find a fix for the problem or rebase the next release branch so that the offending change is removed from the branch.

In the case of minor Scala Next releases, if we cannot have a satisfying RC on time, we can skip releasing the stable Scala Next version in the given release cycle. This means there may be cycles during which we release only Scala LTS.

Accounting for delays adds these points to the timeline above:

- `t + 4` - last possible moment to release RC for the Scala LTS patch, which is trying to fix a problem
- `t + 5` - If no RC exists for Scala LTS fixing a problem, a version based on the last non-problematic commit is released. Also, this is the last moment to release RC for the Scala Next minor. Otherwise, we will skip the Scala Next release in the next cycle.

### What is being released?

For the Scala LTS, what is released as an RC is always the current head of the release branch for the next release.

For the Scala Next minor releases RC, it is the head of the `main` branch.

For the Scala Next patches, there are no RCs. As a point of cut-off of the release, we are choosing one relatively recent commit from the `main` branch on which a full Open Community Build was run before the decision. The default choice here is the commit on which the last weekly community build was run.