IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-06 21:25:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update made automatically due to pressing build

Browse source
This commit is contained in:
Li 2022-05-08 12:30:40 +12:00
parent bf4d5f5005
commit f261ea3b88
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
HorseIsleServer/LibHISP/Server/ServerVersion.cs
View file

@ -46,7 +46,7 @@ namespace HISP.Server
} }
public static string GetVersionString() public static string GetVersionString()
{ {
return Resources.GitTag.Replace("\r", "").Replace("\n", "").ToString().Trim() + "."+ GetCommitHashVersion(); return Resources.GitTag.Replace("\r", "").Replace("\n", "").ToString().Trim();
} }
public static string GetBranch() public static string GetBranch()
{ {
@ -72,7 +72,7 @@ namespace HISP.Server
} }
public static string GetBuildString() public static string GetBuildString()
{ {
return PRODUCT + " " + GetVersionString() + " " + GetBranch() + " (" + GetArchitecture() + "; " + GetPlatform() + "); Built @ " + GetBuildDate() + " " + GetBuildTime(); return PRODUCT + " " + GetVersionString() + " " + GetBranch() + "@" + GetCommitHash(4) + " (" + GetArchitecture() + "; " + GetPlatform() + "); Built @ " + GetBuildDate() + " " + GetBuildTime();
} }
} }
} }

8
HorseIsleServer/build.py
View file

@ -1,7 +1,7 @@
#!/bin/python3 #!/usr/bin/python3
import os import os
import subprocess import subprocess
import date import time
import datetime import datetime
import struct import struct
import binascii import binascii
@ -23,8 +23,12 @@ commit_tag = "v0.0.0"
commit_branch = "master" commit_branch = "master"
try: try:
subprocess.run(['git', 'add', '-A'], stdout=subprocess.PIPE)
subprocess.run(['git', 'commit', '-m', 'Update made automatically due to pressing build'], stdout=subprocess.PIPE)
commit_hash = subprocess.run(['git', 'rev-parse', '--verify', 'HEAD'], stdout=subprocess.PIPE).stdout.replace(b"\r", b"").replace(b"\n", b"").decode("UTF-8") commit_hash = subprocess.run(['git', 'rev-parse', '--verify', 'HEAD'], stdout=subprocess.PIPE).stdout.replace(b"\r", b"").replace(b"\n", b"").decode("UTF-8")
commit_tag = subprocess.run(['git', 'describe', '--abbrev=0', '--tags'], stdout=subprocess.PIPE).stdout.replace(b"\r", b"").replace(b"\n", b"").decode("UTF-8") commit_tag = subprocess.run(['git', 'describe', '--abbrev=0', '--tags'], stdout=subprocess.PIPE).stdout.replace(b"\r", b"").replace(b"\n", b"").decode("UTF-8")
commits_since_tag = subprocess.run(['git rev-list', commit_tag+'..HEAD', '--count'], stdout=subprocess.PIPE).stdout.replace(b"\r", b"").replace(b"\n", b"").decode("UTF-8")
commit_tag = + "." + commits_since_tag
commit_branch = subprocess.run(['git', 'branch', '--show-current'], stdout=subprocess.PIPE).stdout.replace(b"\r", b"").replace(b"\n", b"").decode("UTF-8") commit_branch = subprocess.run(['git', 'branch', '--show-current'], stdout=subprocess.PIPE).stdout.replace(b"\r", b"").replace(b"\n", b"").decode("UTF-8")
except FileNotFoundError: except FileNotFoundError:
print("Git not installed") print("Git not installed")