From 0a2d94e425fd6f1ba2a0693d28ca446dfdee763b Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Wed, 21 Jul 2021 09:19:51 -0400 Subject: [PATCH] updated set_build to use GITHUB_ env vars --- docker/set_build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/set_build.py b/docker/set_build.py index 77592c2ef..191abedad 100644 --- a/docker/set_build.py +++ b/docker/set_build.py @@ -20,7 +20,7 @@ def _check_and_set(d: dict, key: str, value: str): def main(): build_info = {item: build_info_mod.__dict__[item] for item in dir(build_info_mod) if not item.startswith("__")} - commit_hash = os.getenv('DOCKER_COMMIT', os.getenv('CI_COMMIT_SHA', os.getenv('TRAVIS_COMMIT'))) + commit_hash = os.getenv('DOCKER_COMMIT', os.getenv('GITHUB_SHA')) if commit_hash is None: raise ValueError("Commit hash not found in env vars") _check_and_set(build_info, "COMMIT_HASH", commit_hash[:6]) @@ -30,7 +30,7 @@ def main(): _check_and_set(build_info, "DOCKER_TAG", docker_tag) _check_and_set(build_info, "BUILD", "docker") else: - ci_tag = os.getenv('CI_COMMIT_TAG', os.getenv('TRAVIS_TAG')) + ci_tag = os.getenv('CI_COMMIT_TAG', os.getenv('GITHUB_REF')) _check_and_set(build_info, "BUILD", "release" if re.match(r'v\d+\.\d+\.\d+$', str(ci_tag)) else "qa") log.debug("build info: %s", ", ".join([f"{k}={v}" for k, v in build_info.items()]))