From 8dd4cdb6d010f96df587485af008efb5575529c2 Mon Sep 17 00:00:00 2001 From: Li Date: Sun, 8 May 2022 13:16:32 +1200 Subject: [PATCH] Update made automatically due to pressing build --- .../HISPd/Properties/AssemblyInfo.cs | 4 ++-- .../HISPd/Resources/DEBIAN/control | 2 +- .../LibHISP/Properties/AssemblyInfo.cs | 4 ++-- .../N00BS/Properties/AssemblyInfo.cs | 4 ++-- HorseIsleServer/prebuild.py | 24 +++++++++++-------- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs index 7800414..044c095 100644 --- a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.2.18")] -[assembly: AssemblyFileVersion("1.6.2.18")] +[assembly: AssemblyVersion("1.6.2.19")] +[assembly: AssemblyFileVersion("1.6.2.19")] diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index 197455c..41a0d9e 100644 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.6.2.17 +Version: 1.6.2.19 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Maintainer: Li Homepage: https://islehorse.com diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs index a53df5e..006b0b9 100644 --- a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.6.2.18")] -[assembly: AssemblyFileVersion("1.6.2.18")] +[assembly: AssemblyVersion("1.6.2.19")] +[assembly: AssemblyFileVersion("1.6.2.19")] diff --git a/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs index 8eb534a..562a92f 100644 --- a/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.2.18")] -[assembly: AssemblyFileVersion("1.6.2.18")] +[assembly: AssemblyVersion("1.6.2.19")] +[assembly: AssemblyFileVersion("1.6.2.19")] diff --git a/HorseIsleServer/prebuild.py b/HorseIsleServer/prebuild.py index d5778ed..7afe142 100644 --- a/HorseIsleServer/prebuild.py +++ b/HorseIsleServer/prebuild.py @@ -11,13 +11,13 @@ def update_asm_info(assemblyinfofile): global commit_tag global commit_branch global assembly_version - lines = open(assemblyinfofile, "r").readlines() + lines = open(assemblyinfofile, "rb").readlines() for i in range(0,len(lines)): - if lines[i].startswith("[assembly: AssemblyVersion(\""): - lines[i] = "[assembly: AssemblyVersion(\""+assembly_version+"\")]\n" - if lines[i].startswith("[assembly: AssemblyFileVersion(\""): - lines[i] = "[assembly: AssemblyFileVersion(\""+assembly_version+"\")]\n" - open(assemblyinfofile, "w").writelines(lines) + if lines[i].startswith(b"[assembly: AssemblyVersion(\""): + lines[i] = b"[assembly: AssemblyVersion(\""+bytes(assembly_version, "UTF-8")+b"\")]\n" + if lines[i].startswith(b"[assembly: AssemblyFileVersion(\""): + lines[i] = b"[assembly: AssemblyFileVersion(\""+bytes(assembly_version, "UTF-8")+b"\")]\n" + open(assemblyinfofile, "wb").writelines(lines) # Determine git stuff. @@ -31,14 +31,12 @@ commit_tag = "v0.0.0" commit_branch = "master" 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_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', 'rev-list', commit_tag+'..HEAD', '--count'], 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: - print("Git not installed") + pass commit_date = datetime.datetime.now().strftime("%d/%m/%Y") commit_time = datetime.datetime.now().strftime("%H:%M:%S") @@ -64,4 +62,10 @@ lines = open(control_file, "rb").readlines() for i in range(0,len(lines)): if lines[i].startswith(b"Version: "): lines[i] = b"Version: "+bytes(commit_tag.replace("v", ""), "UTF-8")+b"\n" -open(control_file, "wb").writelines(lines) \ No newline at end of file +open(control_file, "wb").writelines(lines) + +try: + subprocess.run(['git', 'add', '-A'], stdout=subprocess.PIPE) + subprocess.run(['git', 'commit', '-m', 'Update made automatically due to pressing build'], stdout=subprocess.PIPE) +except FileNotFoundError: + pass \ No newline at end of file