From 5cd51cda8786a5fd56cfdc6e905db0c5dcbeadf2 Mon Sep 17 00:00:00 2001 From: BlackYps Date: Sat, 16 May 2026 18:05:29 +0200 Subject: [PATCH 1/2] Fix unstable patch order --- .github/workflows/scripts/python/changelog_overview.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scripts/python/changelog_overview.py b/.github/workflows/scripts/python/changelog_overview.py index 8ffa1be1de..ad3e5a0ca9 100644 --- a/.github/workflows/scripts/python/changelog_overview.py +++ b/.github/workflows/scripts/python/changelog_overview.py @@ -72,14 +72,14 @@ def process_markdown_file(markdown_file: Path) -> Optional[Tuple[str, date]]: URL = "http://faforever.github.io/fa/changelog/{url}", Path = "/lua/ui/lobby/changelog/generated/{markdown_file.stem}.lua" }},""" - return entry, parsed_date + return entry, parsed_date, int(version) except Exception as e: raise RuntimeError(f"Failed to process {markdown_file.name}") from e def create_overview_file(input_dir: Path, output_file: Path): """Creates an overview Lua file listing all changelogs with metadata.""" - entries: list[Tuple[str, date]] = [] + entries: list[Tuple[str, date, int]] = [] logging.info(f"Scanning directory: {input_dir}") for markdown_file in input_dir.glob("*.md"): @@ -91,7 +91,8 @@ def create_overview_file(input_dir: Path, output_file: Path): logging.warning("No valid changelog entries found.") return - entries.sort(key=lambda pair: pair[1], reverse=True) + # Sort by date and then by version + entries.sort(key=lambda pair: (pair[1], pair[2]), reverse=True) logging.info("Generating overview Lua content...") overview_content = OVERVIEW_HEADER + """ @@ -99,7 +100,7 @@ def create_overview_file(input_dir: Path, output_file: Path): Overview = { Changelogs = { """ - overview_content += "\n".join(entry for entry, _ in entries) + overview_content += "\n".join(entry for entry, _, _ in entries) overview_content += "\n }\n}\n" output_file.write_text(overview_content) From 57722b3ee6b489eaadeebd23b5fa03c6f46bc1e2 Mon Sep 17 00:00:00 2001 From: FAForever Machine User Date: Sat, 16 May 2026 16:06:57 +0000 Subject: [PATCH 2/2] Update lobby changelogs --- lua/ui/lobby/changelog/generated/overview.lua | 182 +++++++++--------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/lua/ui/lobby/changelog/generated/overview.lua b/lua/ui/lobby/changelog/generated/overview.lua index ce77332ce7..7709a28056 100644 --- a/lua/ui/lobby/changelog/generated/overview.lua +++ b/lua/ui/lobby/changelog/generated/overview.lua @@ -26,13 +26,6 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3834", Path = "/lua/ui/lobby/changelog/generated/2026-04-06-3834.lua" }, - { - Version = 3832, - Name = "3832 - Hotfix", - Date = "2026-04-01", - URL = "http://faforever.github.io/fa/changelog/3832", - Path = "/lua/ui/lobby/changelog/generated/2026-04-01-3832.lua" - }, { Version = 3833, Name = "3833 - Hotfix", @@ -40,6 +33,13 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3833", Path = "/lua/ui/lobby/changelog/generated/2026-04-01-3833.lua" }, + { + Version = 3832, + Name = "3832 - Hotfix", + Date = "2026-04-01", + URL = "http://faforever.github.io/fa/changelog/3832", + Path = "/lua/ui/lobby/changelog/generated/2026-04-01-3832.lua" + }, { Version = 3831, Name = "3831 - Hotfix", @@ -152,13 +152,6 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3816", Path = "/lua/ui/lobby/changelog/generated/2024-12-10-3816.lua" }, - { - Version = 3813, - Name = "3813 - Game Patch", - Date = "2024-11-29", - URL = "http://faforever.github.io/fa/changelog/3813", - Path = "/lua/ui/lobby/changelog/generated/2024-11-29-3813.lua" - }, { Version = 3815, Name = "3815 - Hotfix", @@ -173,6 +166,13 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3814", Path = "/lua/ui/lobby/changelog/generated/2024-11-29-3814.lua" }, + { + Version = 3813, + Name = "3813 - Game Patch", + Date = "2024-11-29", + URL = "http://faforever.github.io/fa/changelog/3813", + Path = "/lua/ui/lobby/changelog/generated/2024-11-29-3813.lua" + }, { Version = 3812, Name = "3812 - Hotfix", @@ -222,13 +222,6 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3806", Path = "/lua/ui/lobby/changelog/generated/2024-03-31-3806.lua" }, - { - Version = 3804, - Name = "3804 - Hotfix", - Date = "2024-03-24", - URL = "http://faforever.github.io/fa/changelog/3804", - Path = "/lua/ui/lobby/changelog/generated/2024-03-24-3804.lua" - }, { Version = 3805, Name = "3805 - Hotfix", @@ -236,6 +229,13 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3805", Path = "/lua/ui/lobby/changelog/generated/2024-03-24-3805.lua" }, + { + Version = 3804, + Name = "3804 - Hotfix", + Date = "2024-03-24", + URL = "http://faforever.github.io/fa/changelog/3804", + Path = "/lua/ui/lobby/changelog/generated/2024-03-24-3804.lua" + }, { Version = 3803, Name = "3803 - Hotfix", @@ -257,13 +257,6 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3801", Path = "/lua/ui/lobby/changelog/generated/2024-03-16-3801.lua" }, - { - Version = 3780, - Name = "3780 - Hotfix", - Date = "2024-01-26", - URL = "http://faforever.github.io/fa/changelog/3780", - Path = "/lua/ui/lobby/changelog/generated/2024-01-26-3780.lua" - }, { Version = 3781, Name = "3781 - Hotfix", @@ -271,6 +264,13 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3781", Path = "/lua/ui/lobby/changelog/generated/2024-01-26-3781.lua" }, + { + Version = 3780, + Name = "3780 - Hotfix", + Date = "2024-01-26", + URL = "http://faforever.github.io/fa/changelog/3780", + Path = "/lua/ui/lobby/changelog/generated/2024-01-26-3780.lua" + }, { Version = 3779, Name = "3779 - Game Patch", @@ -439,13 +439,6 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3754", Path = "/lua/ui/lobby/changelog/generated/2023-03-05-3754.lua" }, - { - Version = 3751, - Name = "3751 - Game Patch", - Date = "2023-02-25", - URL = "http://faforever.github.io/fa/changelog/3751", - Path = "/lua/ui/lobby/changelog/generated/2023-02-25-3751.lua" - }, { Version = 3753, Name = "3753 - Hotfix", @@ -460,6 +453,13 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3752", Path = "/lua/ui/lobby/changelog/generated/2023-02-25-3752.lua" }, + { + Version = 3751, + Name = "3751 - Game Patch", + Date = "2023-02-25", + URL = "http://faforever.github.io/fa/changelog/3751", + Path = "/lua/ui/lobby/changelog/generated/2023-02-25-3751.lua" + }, { Version = 3750, Name = "3750 - Game Patch", @@ -488,13 +488,6 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3747", Path = "/lua/ui/lobby/changelog/generated/2022-11-15-3747.lua" }, - { - Version = 3745, - Name = "3745 - Game Patch", - Date = "2022-11-06", - URL = "http://faforever.github.io/fa/changelog/3745", - Path = "/lua/ui/lobby/changelog/generated/2022-11-06-3745.lua" - }, { Version = 3746, Name = "3746 - Hotfix", @@ -502,6 +495,13 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3746", Path = "/lua/ui/lobby/changelog/generated/2022-11-06-3746.lua" }, + { + Version = 3745, + Name = "3745 - Game Patch", + Date = "2022-11-06", + URL = "http://faforever.github.io/fa/changelog/3745", + Path = "/lua/ui/lobby/changelog/generated/2022-11-06-3745.lua" + }, { Version = 3744, Name = "3744 - Hotfix", @@ -572,6 +572,13 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3735", Path = "/lua/ui/lobby/changelog/generated/2022-04-24-3735.lua" }, + { + Version = 3734, + Name = "3734 - Hotfix", + Date = "2022-04-22", + URL = "http://faforever.github.io/fa/changelog/3734", + Path = "/lua/ui/lobby/changelog/generated/2022-04-22-3734.lua" + }, { Version = 3733, Name = "3733 - Hotfix", @@ -586,13 +593,6 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3732", Path = "/lua/ui/lobby/changelog/generated/2022-04-22-3732.lua" }, - { - Version = 3734, - Name = "3734 - Hotfix", - Date = "2022-04-22", - URL = "http://faforever.github.io/fa/changelog/3734", - Path = "/lua/ui/lobby/changelog/generated/2022-04-22-3734.lua" - }, { Version = 3731, Name = "3731 - Hotfix", @@ -607,13 +607,6 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3730", Path = "/lua/ui/lobby/changelog/generated/2021-12-23-3730.lua" }, - { - Version = 3728, - Name = "3728 - Game Patch", - Date = "2021-12-20", - URL = "http://faforever.github.io/fa/changelog/3728", - Path = "/lua/ui/lobby/changelog/generated/2021-12-20-3728.lua" - }, { Version = 3729, Name = "3729 - Hotfix", @@ -621,6 +614,13 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3729", Path = "/lua/ui/lobby/changelog/generated/2021-12-20-3729.lua" }, + { + Version = 3728, + Name = "3728 - Game Patch", + Date = "2021-12-20", + URL = "http://faforever.github.io/fa/changelog/3728", + Path = "/lua/ui/lobby/changelog/generated/2021-12-20-3728.lua" + }, { Version = 3727, Name = "3727 - Hotfix", @@ -628,13 +628,6 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3727", Path = "/lua/ui/lobby/changelog/generated/2021-11-26-3727.lua" }, - { - Version = 3725, - Name = "3725 - Game Patch", - Date = "2021-11-26", - URL = "http://faforever.github.io/fa/changelog/3725", - Path = "/lua/ui/lobby/changelog/generated/2021-11-26-3725.lua" - }, { Version = 3726, Name = "3726 - Hotfix", @@ -642,6 +635,13 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3726", Path = "/lua/ui/lobby/changelog/generated/2021-11-26-3726.lua" }, + { + Version = 3725, + Name = "3725 - Game Patch", + Date = "2021-11-26", + URL = "http://faforever.github.io/fa/changelog/3725", + Path = "/lua/ui/lobby/changelog/generated/2021-11-26-3725.lua" + }, { Version = 3724, Name = "3724 - Game Patch", @@ -649,13 +649,6 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3724", Path = "/lua/ui/lobby/changelog/generated/2021-10-04-3724.lua" }, - { - Version = 3722, - Name = "3722 - Hotfix", - Date = "2021-09-19", - URL = "http://faforever.github.io/fa/changelog/3722", - Path = "/lua/ui/lobby/changelog/generated/2021-09-19-3722.lua" - }, { Version = 3723, Name = "3723 - Hotfix", @@ -663,6 +656,13 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3723", Path = "/lua/ui/lobby/changelog/generated/2021-09-19-3723.lua" }, + { + Version = 3722, + Name = "3722 - Hotfix", + Date = "2021-09-19", + URL = "http://faforever.github.io/fa/changelog/3722", + Path = "/lua/ui/lobby/changelog/generated/2021-09-19-3722.lua" + }, { Version = 3721, Name = "3721 - Game Patch", @@ -698,13 +698,6 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3717", Path = "/lua/ui/lobby/changelog/generated/2020-09-13-3717.lua" }, - { - Version = 3715, - Name = "3715 - Game Patch", - Date = "2020-09-12", - URL = "http://faforever.github.io/fa/changelog/3715", - Path = "/lua/ui/lobby/changelog/generated/2020-09-12-3715.lua" - }, { Version = 3716, Name = "3716 - Hotfix", @@ -712,6 +705,13 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3716", Path = "/lua/ui/lobby/changelog/generated/2020-09-12-3716.lua" }, + { + Version = 3715, + Name = "3715 - Game Patch", + Date = "2020-09-12", + URL = "http://faforever.github.io/fa/changelog/3715", + Path = "/lua/ui/lobby/changelog/generated/2020-09-12-3715.lua" + }, { Version = 3714, Name = "3714 - Game Patch", @@ -761,13 +761,6 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3708", Path = "/lua/ui/lobby/changelog/generated/2019-10-19-3708.lua" }, - { - Version = 3706, - Name = "3706 - Hotfix", - Date = "2019-07-14", - URL = "http://faforever.github.io/fa/changelog/3706", - Path = "/lua/ui/lobby/changelog/generated/2019-07-14-3706.lua" - }, { Version = 3707, Name = "3707 - Hotfix", @@ -775,6 +768,13 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3707", Path = "/lua/ui/lobby/changelog/generated/2019-07-14-3707.lua" }, + { + Version = 3706, + Name = "3706 - Hotfix", + Date = "2019-07-14", + URL = "http://faforever.github.io/fa/changelog/3706", + Path = "/lua/ui/lobby/changelog/generated/2019-07-14-3706.lua" + }, { Version = 3705, Name = "3705 - Game Patch", @@ -971,6 +971,13 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3671", Path = "/lua/ui/lobby/changelog/generated/2017-01-19-3671.lua" }, + { + Version = 3670, + Name = "3670 - Hotfix", + Date = "2017-01-17", + URL = "http://faforever.github.io/fa/changelog/3670", + Path = "/lua/ui/lobby/changelog/generated/2017-01-17-3670.lua" + }, { Version = 3669, Name = "3669 - Hotfix", @@ -985,13 +992,6 @@ Overview = { URL = "http://faforever.github.io/fa/changelog/3668", Path = "/lua/ui/lobby/changelog/generated/2017-01-17-3668.lua" }, - { - Version = 3670, - Name = "3670 - Hotfix", - Date = "2017-01-17", - URL = "http://faforever.github.io/fa/changelog/3670", - Path = "/lua/ui/lobby/changelog/generated/2017-01-17-3670.lua" - }, { Version = 3667, Name = "3667 - Hotfix",