]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Revert "Allow configuring gen_build_info.py through environment variables" (#25201)
authorPieter-Jan Briers <pieterjan.briers+git@gmail.com>
Wed, 14 Feb 2024 00:20:30 +0000 (01:20 +0100)
committerGitHub <noreply@github.com>
Wed, 14 Feb 2024 00:20:30 +0000 (01:20 +0100)
Revert "Allow configuring gen_build_info.py through environment variables (#2…"

This reverts commit 163e6d2f896ccf9a37be2e17bbbad8b6514ccf4b.

Tools/gen_build_info.py

index 0da5d7f48f6c97fa10b5bf74e172b80e0a8dc197..0207f568dd72f067098ce8a25abb29e4073db185 100755 (executable)
@@ -19,11 +19,11 @@ SERVER_FILES = [
     "SS14.Server_osx-x64.zip"
 ]
 
-FORK_ID = os.environ.get("CDN_FORK_ID", "wizards")
-HOSTNAME = os.environ.get("CDN_HOSTNAME", "cdn.centcomm.spacestation14.com")
-BUILD_URL = f"https://{HOSTNAME}/builds/{FORK_ID}/builds/{{FORK_VERSION}}/{FILE}"
-MANIFEST_URL = f"https://{HOSTNAME}/version/{{FORK_VERSION}}/manifest"
-MANIFEST_DOWNLOAD_URL = f"https://{HOSTNAME}/version/{{FORK_VERSION}}/download"
+VERSION = os.environ['GITHUB_SHA']
+FORK_ID = "wizards"
+BUILD_URL = f"https://cdn.centcomm.spacestation14.com/builds/wizards/builds/{{FORK_VERSION}}/{FILE}"
+MANIFEST_URL = f"https://cdn.centcomm.spacestation14.com/cdn/version/{{FORK_VERSION}}/manifest"
+MANIFEST_DOWNLOAD_URL = f"https://cdn.centcomm.spacestation14.com/cdn/version/{{FORK_VERSION}}/download"
 
 def main() -> None:
     client_file = os.path.join("release", FILE)
@@ -38,25 +38,17 @@ def inject_manifest(zip_path: str, manifest: str) -> None:
         z.writestr("build.json", manifest)
 
 
-def get_git_sha() -> str:
-    proc = subprocess.run(["git", "rev-parse", "HEAD"], stdout=subprocess.PIPE, check=True, encoding="UTF-8")
-    tag = proc.stdout.strip()
-    return tag
-
 def generate_build_json(file: str) -> str:
     # Env variables set by Jenkins.
 
     hash = sha256_file(file)
     engine_version = get_engine_version()
     manifest_hash = generate_manifest_hash(file)
-    version = os.environ.get("GITHUB_SHA")
-    if not version:
-        version = get_git_sha()
 
     return json.dumps({
         "download": BUILD_URL,
         "hash": hash,
-        "version": version,
+        "version": VERSION,
         "fork_id": FORK_ID,
         "engine_version": engine_version,
         "manifest_url": MANIFEST_URL,
@@ -64,7 +56,6 @@ def generate_build_json(file: str) -> str:
         "manifest_hash": manifest_hash
     })
 
-
 def generate_manifest_hash(file: str) -> str:
     zip = ZipFile(file)
     infos = zip.infolist()
@@ -92,6 +83,7 @@ def get_engine_version() -> str:
     assert tag.startswith("v")
     return tag[1:] # Cut off v prefix.
 
+
 def sha256_file(path: str) -> str:
     with open(path, "rb") as f:
         h = hashlib.sha256()