Ticket #44374

S3_2 branching

Eröffnet am: 2022-04-14 19:43 Letztes Update: 2023-01-23 06:05

Auswertung:
Verantwortlicher:
Typ:
Status:
Offen [Owner assigned]
Komponente:
(Keine)
Meilenstein:
(Keine)
Priorität:
5 - Mittel
Schweregrad:
5 - Mittel
Lösung:
Keine
Datei:
Keine

Details

This ticket is for collecting things needed for next branching from master, namely that of S3_2.

For reference, ticket about S3_1 branching: https://www.hostedredmine.com/issues/656468

S3_1 was branched in the beginning of February 2021. With the planned every-two-years frequency we then aim to S3_2 branching in early 2023.

--

Blockers:

- Update custom modpacks: #46366
- Moving actions to actions.ruleset in supplied rulesets, so they will load when 3.1 -> 3.2 compatibility code dropped: #45066 (done)

--

At the same time / soon after branching:

#44375 - Rename of 'master'

Ticket-Verlauf (3/10 Historien)

2022-04-14 19:43 Aktualisiert von: cazfi
  • New Ticket "S3_2 branching" created
2022-04-14 19:53 Aktualisiert von: cazfi
  • Details Updated
2022-04-25 20:53 Aktualisiert von: alain_bkr
Kommentar

Why create in advance a S3_2 branch, and not keep development in master until it reaches a alpha status ?

After 3.1 the 3.2 is implicit (in master) until the branch is created, like gcc which is far more critical and complex than Freeciv. https://gcc.gnu.org/develop.html#timeline

2022-04-25 20:59 Aktualisiert von: cazfi
Kommentar

Reply To alain_bkr

Why create in advance a S3_2 branch, and not keep development in master until it reaches a alpha status ?

Yes, branching is where we change the version label to "alpha". That people tend to after branching try (and get) to get in such development that really belongs to master only is another problem. The time our versions live in "stable" (that's what 'S' is supposed to mean) is ridiculous, though it's partly due to compatibility freeze levels.
2022-04-25 21:19 Aktualisiert von: cazfi
Kommentar

Reply To cazfi

Reply To alain_bkr

Why create in advance a S3_2 branch, and not keep development in master until it reaches a alpha status ?

Yes, branching is where we change the version label to "alpha". That people tend to after branching try (and get) to get in such development that really belongs to master only is another problem. The time our versions live in "stable" (that's what 'S' is supposed to mean) is ridiculous, though it's partly due to compatibility freeze levels.

Somehow related, latest about 3.2 schedule on freeciv-dev: https://www.freelists.org/post/freeciv-dev/Freeciv31-Freeciv32-schedule,1

2022-05-07 00:19 Aktualisiert von: alain_bkr
Kommentar

Ok i understand, and i like one release every 2 years, no matter if it big or small. I just fear 4 maintained branches (2.6 , 3.0, 3.1 and 3.2)

Maybe keep 2.6 , mostly frozen, for old hardware and old libs , and one 3.x release ?

3.1 in late 2022 , maybe including the changes in master if this makes sense (and abandon/freeze 3.0 )

Then 3.2 in 2024 (and abandon/freeze previous 3.x)

Other projects i know like Wesnoth or Lincity-ng do work like this, with only one active version. This is simple to follow and reduces your maintenance burden, and is easy to understand for contributors

/just my 2 cents

2022-05-07 22:40 Aktualisiert von: cazfi
Kommentar

Reply To alain_bkr

I just fear 4 maintained branches (2.6 , 3.0, 3.1 and 3.2)

Yeah, number of parallel branches can be a problem. But in practice it has not been as bad as one might expect - most backports are trivial to make (to the extend that 'git cherry-pick' works with no need to do any backporting at all).

As for S2_6, it's sort of officially EOL already, but I've been still pushing some stuff there for people who may build freeciv-2.6 from git. Practically all public servers are still using freeciv-2.6: http://meta.freeciv.org/

2022-12-26 13:59 Aktualisiert von: cazfi
  • Details Updated
2023-01-09 11:18 Aktualisiert von: cazfi
  • Details Updated
2023-01-23 06:05 Aktualisiert von: cazfi
  • Details Updated
Kommentar

Patch going to S3_2 after branching should consider: #46594

Dateianhangliste

Keine Anhänge

Bearbeiten

You are not logged in. I you are not logged in, your comment will be treated as an anonymous post. » Anmelden