updated set_build to use GITHUB_ env vars
This commit is contained in:
parent
8d9073cd31
commit
0a2d94e425
1 changed files with 2 additions and 2 deletions
|
@ -20,7 +20,7 @@ def _check_and_set(d: dict, key: str, value: str):
|
||||||
def main():
|
def main():
|
||||||
build_info = {item: build_info_mod.__dict__[item] for item in dir(build_info_mod) if not item.startswith("__")}
|
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:
|
if commit_hash is None:
|
||||||
raise ValueError("Commit hash not found in env vars")
|
raise ValueError("Commit hash not found in env vars")
|
||||||
_check_and_set(build_info, "COMMIT_HASH", commit_hash[:6])
|
_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, "DOCKER_TAG", docker_tag)
|
||||||
_check_and_set(build_info, "BUILD", "docker")
|
_check_and_set(build_info, "BUILD", "docker")
|
||||||
else:
|
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")
|
_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()]))
|
log.debug("build info: %s", ", ".join([f"{k}={v}" for k, v in build_info.items()]))
|
||||||
|
|
Loading…
Reference in a new issue