Browse Source

set child repo commitId's if all projects build successfully

pull/5418/head
İsmail ÇAĞDAŞ 6 years ago
parent
commit
7f20f93e9f
  1. 20
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultBuildStatusGenerator.cs
  2. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultChangedProjectFinder.cs
  3. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs

20
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultBuildStatusGenerator.cs

@ -45,7 +45,13 @@ namespace Volo.Abp.Cli.Build
foreach (var dependingRepository in buildConfig.GitRepository.DependingRepositories)
{
GenerateBuildStatusInternal(dependingRepository, changedProjects, buildSucceededProjects, status);
GenerateBuildStatusInternal(
buildConfig,
dependingRepository,
changedProjects,
buildSucceededProjects,
status
);
}
return status;
@ -60,7 +66,7 @@ namespace Volo.Abp.Cli.Build
{
return false;
}
if (changedProjects.Count == 0 || buildSucceededProjects.Count == 0)
{
return false;
@ -70,6 +76,7 @@ namespace Volo.Abp.Cli.Build
}
private void GenerateBuildStatusInternal(
DotNetProjectBuildConfig buildConfig,
GitRepository gitRepository,
List<DotNetProjectInfo> changedProjects,
List<string> buildSucceededProjects,
@ -81,10 +88,12 @@ namespace Volo.Abp.Cli.Build
var dependingRepositoryStatus = new GitRepositoryBuildStatus(
gitRepository.Name,
repoFriendlyName
)
);
if (ShouldUpdateRepositoryCommitId(buildConfig, changedProjects, buildSucceededProjects))
{
CommitId = lastCommitId
};
dependingRepositoryStatus.CommitId = lastCommitId;
}
dependingRepositoryStatus.SucceedProjects = changedProjects.Where(p =>
p.RepositoryName == gitRepository.Name &&
@ -99,6 +108,7 @@ namespace Volo.Abp.Cli.Build
foreach (var dependingRepository in gitRepository.DependingRepositories)
{
GenerateBuildStatusInternal(
buildConfig,
dependingRepository,
changedProjects,
buildSucceededProjects,

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultChangedProjectFinder.cs

@ -194,8 +194,6 @@ namespace Volo.Abp.Cli.Build
continue;
}
x = 5;
// Filter ignored directories
var isIgnored = repository.IgnoredDirectories.Any(ignoredDirectory =>
csProjPath.StartsWith(Path.Combine(repository.RootPath, ignoredDirectory)));

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs

@ -59,7 +59,7 @@ namespace Volo.Abp.Cli.Commands
changedProjectFiles,
dotnetBuildArguments ?? ""
);
var buildStatus = BuildStatusGenerator.Generate(
buildConfig,
changedProjectFiles,

Loading…
Cancel
Save