iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Try to fix version info in CI builds again

Browse Source
This commit is contained in:
Tulir Asokan
2019-12-23 19:15:36 +02:00
parent 9fb2a73ec5
commit 9f3869e878
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/get_version.py
+6 -7
View File
@@ -15,8 +15,12 @@ cmd_env = {
def run(cmd):
return subprocess.check_output(cmd, stderr=subprocess.DEVNULL, env=cmd_env)
if os.path.exists(".git") and shutil.which("git"):
if os.environ.get("CI_SERVER", "no") == "yes":
git_revision = os.environ["CI_COMMIT_SHA"]
git_revision_url = f"https://github.com/tulir/mautrix-telegram/commit/{git_revision}"
git_revision = git_revision[:8]
git_tag = os.environ.get("CI_COMMIT_TAG", None)
elif os.path.exists(".git") and shutil.which("git"):
try:
git_revision = run(["git", "rev-parse", "HEAD"]).strip().decode("ascii")
git_revision_url = f"https://github.com/tulir/mautrix-telegram/commit/{git_revision}"
@@ -29,11 +33,6 @@ if os.path.exists(".git") and shutil.which("git"):
git_tag = run(["git", "describe", "--exact-match", "--tags"]).strip().decode("ascii")
except (subprocess.SubprocessError, OSError):
git_tag = None
elif os.environ.get("CI_SERVER", "no") == "yes":
git_revision = os.environ["CI_COMMIT_SHA"]
git_revision_url = f"https://github.com/tulir/mautrix-telegram/commit/{git_revision}"
git_revision = git_revision[:8]
git_tag = os.environ.get("CI_COMMIT_TAG", None)
else:
git_revision = "unknown"
git_revision_url = None