From 8bee6edc478ba11afab57c8b8791a12f08b447cb Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Mon, 12 Feb 2024 09:53:36 -0800 Subject: [PATCH] fix(ci): Docker master builds fail while checking version (#27087) --- scripts/build_docker.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/build_docker.py b/scripts/build_docker.py index 2a9e676d9..00023afc0 100755 --- a/scripts/build_docker.py +++ b/scripts/build_docker.py @@ -28,7 +28,7 @@ CACHE_REPO = f"{REPO}-cache" BASE_PY_IMAGE = "3.9-slim-bookworm" -def run_cmd(command: str) -> str: +def run_cmd(command: str, raise_on_failure: bool = True) -> str: process = subprocess.Popen( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True ) @@ -41,9 +41,8 @@ def run_cmd(command: str) -> str: process.wait() # Wait for the subprocess to finish - if process.returncode != 0: + if process.returncode != 0 and raise_on_failure: raise subprocess.CalledProcessError(process.returncode, command, output) - return output @@ -73,7 +72,13 @@ def get_build_context_ref(build_context: str) -> str: def is_latest_release(release: str) -> bool: - output = run_cmd(f"./scripts/tag_latest_release.sh {release} --dry-run") or "" + output = ( + run_cmd( + f"./scripts/tag_latest_release.sh {release} --dry-run", + raise_on_failure=False, + ) + or "" + ) return "SKIP_TAG::false" in output