StarMirror
/
BuildFeed
mirror of https://gitlab.com/buildfeed/BuildFeed
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add better support for 19h1_* branches

master
BuildFeed Bot 2019-01-08 19:22:53 +00:00
parent 7b829aa0a8
commit dee85fc12d
No known key found for this signature in database
GPG Key ID: 3757685ADD91E0A1
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BuildFeed.Model/Build.cs
View File

@ -155,12 +155,15 @@ namespace BuildFeed.Model
private void GenerateFamily()
{
// start with lab-based overrides
if (Lab?.StartsWith("rs5", StringComparison.InvariantCultureIgnoreCase) ?? false)
if (Lab?.StartsWith("19h1", StringComparison.InvariantCultureIgnoreCase) ?? false)
{
Family = ProjectFamily.SAR_19H1;
}
else if (Lab?.StartsWith("rs5", StringComparison.InvariantCultureIgnoreCase) ?? false)
{
Family = ProjectFamily.Redstone5;
}
else
if (Lab?.StartsWith("rs4", StringComparison.InvariantCultureIgnoreCase) ?? false)
else if (Lab?.StartsWith("rs4", StringComparison.InvariantCultureIgnoreCase) ?? false)
{
Family = ProjectFamily.Redstone4;
}

2
BuildFeed/Controllers/frontController.cs
View File

@ -576,7 +576,7 @@ namespace BuildFeed.Controllers
StringSplitOptions.RemoveEmptyEntries))
{
Match m = Regex.Match(line,
@"(([\d]{1,2})\.([\d]{1,2})\.)?([\d]{4,5})(\.([\d]{1,5}))?(\.| \()([a-zA-Z][a-zA-Z0-9._\(\)-]+?)\.(\d\d\d\d\d\d-\d\d\d\d)\)?");
@"(([\d]{1,2})\.([\d]{1,2})\.)?([\d]{4,5})(\.([\d]{1,5}))?(\.| \()([a-zA-Z0-9][a-zA-Z0-9_\(\)]+?)\.(\d\d\d\d\d\d-\d\d\d\d)\)?");
if (m.Success)
{
try

2
BuildFeed/Views/front/editBuild.cshtml
View File

@ -179,7 +179,7 @@ else
.change(function()
{
var regex =
/(([\d]{1,2})\.([\d]{1,2})\.)?([\d]{4,5})(\.([\d]{1,5}))?(\.| \()([a-zA-Z][a-zA-Z0-9._\(\)-]+?)\.(\d\d\d\d\d\d-\d\d\d\d)\)?/;
/(([\d]{1,2})\.([\d]{1,2})\.)?([\d]{4,5})(\.([\d]{1,5}))?(\.| \()([a-zA-Z0-9][a-zA-Z0-9_\(\)]+?)\.(\d\d\d\d\d\d-\d\d\d\d)\)?/;
var result = regex.exec($("#quickpaste").val());
$("#MajorVersion").val(result[2]);