From 467049d4dde2b4b459b2f70df34f27749acdf245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Mon, 19 Dec 2022 19:57:49 +0100 Subject: [PATCH] Ignore mod_id.txt if the mod ID is set in meson_options.txt Fixes forward-incompatible behaviour introduced by 0ff08c276f1909865de0c181e4d5e2fd96bda01f. The idea is to have mod owners migrate from using mod_id.txt to using meson_options.txt, but if prepare.py unconditionally prefers the former, nobody can use the latter. --- .github/prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/prepare.py b/.github/prepare.py index dde923f24..4c2617b0f 100755 --- a/.github/prepare.py +++ b/.github/prepare.py @@ -46,7 +46,7 @@ with open('build-prepare/meson-info/intro-buildoptions.json') as f: for option in json.loads(f.read()): build_options[option['name']] = option['value'] -if os.path.exists('.github/mod_id.txt'): +if int(build_options['mod_id']) == 0 and os.path.exists('.github/mod_id.txt'): with open('.github/mod_id.txt') as f: build_options['mod_id'] = f.read()