iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

get the right release version on windows

This commit is contained in:
odrling 2019-08-31 12:09:54 +02:00
parent a08026ba41
commit 4b2f9d864a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -79,7 +79,7 @@ after_build:
- cd ..\.. - cd ..\..
on_success: on_success:
- bash.exe ".ci\upload_win_installer.sh" - IF DEFINED APPVEYOR_REPO_TAG_NAME bash.exe ".ci\upload_win_installer.sh"
artifacts: artifacts:
- path: packages\win_installer\output\Aegisub-Japan7-x64.exe - path: packages\win_installer\output\Aegisub-Japan7-x64.exe

10
build/BuildTasks/GitVersion.cs
View File

@ -85,7 +85,7 @@ namespace BuildTasks {
string installerVersion = "0.0.0"; string installerVersion = "0.0.0";
string resourceVersion = "0, 0, 0"; string resourceVersion = "0, 0, 0";
string versionStr = null; string versionStr = null;
var releaseVersion = null; Tag releaseVersion = null;
bool taggedRelease = false; bool taggedRelease = false;
using (var repo = new Repository(Root + ".git")) { using (var repo = new Repository(Root + ".git")) {
commits += repo.Commits.TakeWhile(c => !c.Id.Equals(LastSVNCommit)).Count(); commits += repo.Commits.TakeWhile(c => !c.Id.Equals(LastSVNCommit)).Count();
@ -96,11 +96,11 @@ namespace BuildTasks {
} else { } else {
var filter = new CommitFilter() var filter = new CommitFilter()
{ {
IncludeReachableFrom = tag.Target.Sha, Since = tag.Target.Sha,
ExcludeReachableFrom = releaseVersion.Target.Sha Until = releaseVersion.Target.Sha
}; };
if (repo.Commits.QueryBy(filter).ToList().Count == 0) if (repo.Commits.QueryBy(filter).ToList().Count > 0)
releaseVersion = tag; releaseVersion = tag;
} }
@ -123,7 +123,7 @@ namespace BuildTasks {
} }
} }
WriteIfChanged(versionHPath, versionHTemplate, releaseVersion.Shorten(), commits, versionStr, taggedRelease ? "1" : "0", installerVersion, resourceVersion); WriteIfChanged(versionHPath, versionHTemplate, commits, versionStr, releaseVersion.Name.TrimStart('v'), taggedRelease ? "1" : "0", installerVersion, resourceVersion);
WriteIfChanged(versionXmlPath, versionXmlTemplate, commits, versionStr); WriteIfChanged(versionXmlPath, versionXmlTemplate, commits, versionStr);
return true; return true;