From 02f837ca1c02e602ed97e4ab49a97e84416a5fe3 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 13 Apr 2025 13:47:05 +0200 Subject: fix: allow NeoForge snapshots to be generated Signed-off-by: Sefa Eyeoglu --- meta/run/update_neoforge.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/run/update_neoforge.py b/meta/run/update_neoforge.py index 60b94ec6b1..25c316321f 100644 --- a/meta/run/update_neoforge.py +++ b/meta/run/update_neoforge.py @@ -144,7 +144,7 @@ def main(): r"^(?P[0-9a-zA-Z_\.]+)-(?P[0-9\.]+\.(?P[0-9]+))(-(?P[a-zA-Z0-9\.]+))?$" ) neoforge_version_re = re.compile( - r"^(?P\d+).(?P\d+).(?P\d+)(?:-(?P\w+))?$" + r"^(?P\d+).(?:(?P\d+)|(?P[0-9a-z]+)).(?P\d+)(?:-(?P\w+))?$" ) print("") @@ -162,9 +162,11 @@ def main(): match_nf = neoforge_version_re.match(long_version) if match_nf: - mc_version = f"1.{match_nf.group('mcminor')}" - if match_nf.group("mcpatch") != "0": - mc_version += f".{match_nf.group('mcpatch')}" + mc_version = match_nf.group("snapshot") + if not mc_version: + mc_version = f"1.{match_nf.group('mcminor')}" + if match_nf.group("mcpatch") != "0": + mc_version += f".{match_nf.group('mcpatch')}" build = int(match_nf.group("number")) version = match_nf.group("number") branch = match_nf.group("tag") -- cgit 0.0.5-2-1-g0f52