mirror of
https://github.com/The-Powder-Toy/The-Powder-Toy.git
synced 2025-08-18 06:01:19 +02:00
Ignore mod_id.txt if the mod ID is set in meson_options.txt
Fixes forward-incompatible behaviour introduced by 0ff08c276f
. 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.
This commit is contained in:
2
.github/prepare.py
vendored
2
.github/prepare.py
vendored
@@ -46,7 +46,7 @@ with open('build-prepare/meson-info/intro-buildoptions.json') as f:
|
|||||||
for option in json.loads(f.read()):
|
for option in json.loads(f.read()):
|
||||||
build_options[option['name']] = option['value']
|
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:
|
with open('.github/mod_id.txt') as f:
|
||||||
build_options['mod_id'] = f.read()
|
build_options['mod_id'] = f.read()
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user