Small fix to asset compilation retry (apache#45144)

Try num printed is now more human, and capture_output is added - it was missing in the original apache#45143
eladkal · Dec 22, 2024 · 9e28fcb · 9e28fcb
1 parent a8c4871
commit 9e28fcb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/scripts/ci/pre_commit/compile_ui_assets.py b/scripts/ci/pre_commit/compile_ui_assets.py
@@ -71,12 +71,13 @@ def get_directory_hash(directory: Path, skip_path_regexp: str | None = None) ->
     env = os.environ.copy()
     env["FORCE_COLOR"] = "true"
     for try_num in range(3):
-        print(f"### Trying to install yarn dependencies: attempt: {try_num} ###")
+        print(f"### Trying to install yarn dependencies: attempt: {try_num + 1} ###")
         result = subprocess.run(
             ["pnpm", "install", "--frozen-lockfile", "--config.confirmModulesPurge=false"],
             cwd=os.fspath(ui_directory),
             text=True,
             check=False,
+            capture_output=True,
         )
         if result.returncode == 0:
             break

diff --git a/scripts/ci/pre_commit/compile_www_assets.py b/scripts/ci/pre_commit/compile_www_assets.py
@@ -71,9 +71,13 @@ def get_directory_hash(directory: Path, skip_path_regexp: str | None = None) ->
     env = os.environ.copy()
     env["FORCE_COLOR"] = "true"
     for try_num in range(3):
-        print(f"### Trying to install yarn dependencies: attempt: {try_num} ###")
+        print(f"### Trying to install yarn dependencies: attempt: {try_num + 1} ###")
         result = subprocess.run(
-            ["yarn", "install", "--frozen-lockfile"], cwd=os.fspath(www_directory), text=True, check=False
+            ["yarn", "install", "--frozen-lockfile"],
+            cwd=os.fspath(www_directory),
+            text=True,
+            check=False,
+            capture_output=True,
         )
         if result.returncode == 0:
             break