Skip to content

Allow automatic triggering to public PR pipelines #1723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weshaggard merged 1 commit into from
Jun 21, 2021
Merged

Allow automatic triggering to public PR pipelines #1723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...tor/Azure.Sdk.Tools.PipelineGenerator/Conventions/IntegrationTestingPipelineConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ protected override async Task<bool> ApplyConventionAsync(BuildDefinition definit
{
var hasChanges = await base.ApplyConventionAsync(definition, component);

if (EnsureDefautPullRequestTrigger(definition, overrideYaml: true))
if (EnsureDefautPullRequestTrigger(definition, overrideYaml: true, securePipeline: true))
{
hasChanges = true;
}
Expand Down
19 changes: 10 additions & 9 deletions tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/PipelineConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ protected virtual Task<bool> ApplyConventionAsync(BuildDefinition definition, Sd
return Task.FromResult(hasChanges);
}

protected bool EnsureDefautPullRequestTrigger(BuildDefinition definition, bool overrideYaml = true)
protected bool EnsureDefautPullRequestTrigger(BuildDefinition definition, bool overrideYaml = true, bool securePipeline = true)
{
bool hasChanges = false;
var prTriggers = definition.Triggers.OfType<PullRequestTrigger>();
Expand All @@ -333,11 +333,12 @@ protected bool EnsureDefautPullRequestTrigger(BuildDefinition definition, bool o

newTrigger.Forks = new Forks
{
AllowSecrets = true,
AllowSecrets = securePipeline,
Enabled = true
};

newTrigger.RequireCommentsForNonTeamMembersOnly = false;
newTrigger.IsCommentRequiredForPullRequest = true;
newTrigger.IsCommentRequiredForPullRequest = securePipeline;

definition.Triggers.Add(newTrigger);
hasChanges = true;
Expand Down Expand Up @@ -366,16 +367,16 @@ protected bool EnsureDefautPullRequestTrigger(BuildDefinition definition, bool o
}

}
if (trigger.RequireCommentsForNonTeamMembersOnly ||
!trigger.Forks.AllowSecrets ||
!trigger.Forks.Enabled ||
!trigger.IsCommentRequiredForPullRequest
if (trigger.RequireCommentsForNonTeamMembersOnly != false ||
trigger.Forks.AllowSecrets != securePipeline ||
trigger.Forks.Enabled != true ||
trigger.IsCommentRequiredForPullRequest != securePipeline
)
{
trigger.Forks.AllowSecrets = true;
trigger.Forks.AllowSecrets = securePipeline;
trigger.Forks.Enabled = true;
trigger.RequireCommentsForNonTeamMembersOnly = false;
trigger.IsCommentRequiredForPullRequest = true;
trigger.IsCommentRequiredForPullRequest = securePipeline;

hasChanges = true;
}
Expand Down
2 changes: 1 addition & 1 deletion .../Azure.Sdk.Tools.PipelineGenerator/Conventions/PullRequestValidationPipelineConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ protected override async Task<bool> ApplyConventionAsync(BuildDefinition definit
{
var hasChanges = await base.ApplyConventionAsync(definition, component);

if (EnsureDefautPullRequestTrigger(definition, overrideYaml: false))
if (EnsureDefautPullRequestTrigger(definition, overrideYaml: false, securePipeline: false))
{
hasChanges = true;
}
Expand Down
2 changes: 1 addition & 1 deletion ...line-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/UnifiedPipelineConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ protected override async Task<bool> ApplyConventionAsync(BuildDefinition definit
{
var hasChanges = await base.ApplyConventionAsync(definition, component);

if (EnsureDefautPullRequestTrigger(definition, overrideYaml: true))
if (EnsureDefautPullRequestTrigger(definition, overrideYaml: true, securePipeline: true))
{
hasChanges = true;
}
Expand Down