From d2a413417e49a547e44d669ba4f9e2cce546207e Mon Sep 17 00:00:00 2001 From: Nikolas Date: Mon, 26 Aug 2024 09:53:12 -0700 Subject: [PATCH] update to godot 4.3-stable --- .gitignore | 2 ++ godot_compile/godot_compile.py | 4 ++-- godot_compile/godot_compile_utils.py | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8d415df..76174f7 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,8 @@ xz_5.6.2_x86* *.mp4 godot-4.2.1-stable/ godot-4.2.1-stable.zip +godot-4.3-stable/ +godot-4.3-stable.zip mingw64/ # python diff --git a/godot_compile/godot_compile.py b/godot_compile/godot_compile.py index f6f3b54..ff6629e 100644 --- a/godot_compile/godot_compile.py +++ b/godot_compile/godot_compile.py @@ -78,11 +78,11 @@ def main(): report = { "start_time": start_time, - "version": "4.2.1-stable", + "version": "4.3-stable", "end_time": end_time, "score": score, "unit": "seconds", - "test": "Godot 4.2.1 Compile" + "test": "Godot 4.3 Compile" } write_report_json(LOG_DIR, "report.json", report) diff --git a/godot_compile/godot_compile_utils.py b/godot_compile/godot_compile_utils.py index 4cfbab0..0a3f357 100644 --- a/godot_compile/godot_compile_utils.py +++ b/godot_compile/godot_compile_utils.py @@ -14,6 +14,7 @@ MINGW_ZIP = "x86_64-13.2.0-release-posix-seh-msvcrt-rt_v11-rev1.zip" MINGW_FOLDER = SCRIPT_DIR.joinpath("mingw64") MINICONDA_EXECUTABLE_PATH = Path("C:\\ProgramData\\miniconda3\\_conda.exe") CONDA_ENV_NAME = "godotbuild" +GODOT_DIR = "godot-4.3-stable" def install_mingw() -> str: @@ -56,9 +57,9 @@ def install_miniconda() -> str: def copy_godot_source_from_network_drive() -> str: """copies godot source files from the network drive""" - if SCRIPT_DIR.joinpath("godot-4.2.1-stable").is_dir(): + if SCRIPT_DIR.joinpath(GODOT_DIR).is_dir(): return "existing godot source directory detected" - zip_name = "godot-4.2.1-stable.zip" + zip_name = f"{GODOT_DIR}.zip" source = Path("\\\\Labs\\labs\\03_ProcessingFiles\\Godot Files\\" + zip_name) destination = SCRIPT_DIR.joinpath(zip_name) shutil.copyfile(source, destination) @@ -104,7 +105,7 @@ def run_conda_command(conda_cmd: List[str]) -> str: "-n", "godotbuild", "--cwd", - str(SCRIPT_DIR.joinpath("godot-4.2.1-stable")), + str(SCRIPT_DIR.joinpath(GODOT_DIR)), ] + conda_cmd output = subprocess.check_output(command, stderr=subprocess.PIPE, text=True) return output