Skip to content
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

Fix code-quality-reports Scheduled and Manual Runs #27129

Merged
merged 7 commits into from
Feb 17, 2022
Merged

Fix code-quality-reports Scheduled and Manual Runs #27129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c863c0
Fix code-quality-reports Scheduled and Manual Runs
alzimmermsft Feb 15, 2022
11f6ecc
Change to use custom command only on pull request and merge CI
alzimmermsft Feb 15, 2022
0e37b47
Change to use custom command only on pull request and merge CI
alzimmermsft Feb 15, 2022
8a11276
Update eng/pipelines/scripts/Get-Linting-Commands.ps1
alzimmermsft Feb 16, 2022
173841c
Merge branch 'main' into AzEng_FixCodeQualityReportsScheduledRun
alzimmermsft Feb 16, 2022
552c011
Run full linting on all non-PR pipeline runs
alzimmermsft Feb 16, 2022
97f7c95
Merge branch 'AzEng_FixCodeQualityReportsScheduledRun' of https://git…
alzimmermsft Feb 16, 2022
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: 0 additions & 2 deletions eng/pipelines/code-quality-reports.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ jobs:
arguments: >
-BuildReason $(Build.Reason)
-SourceBranch "HEAD"
-TargetBranch "origin/$("$(System.PullRequest.TargetBranch)"
-replace "refs/heads/")"
-LintingPipelineVariable "LintingGoals"
pwsh: true
displayName: 'Generate Linting Commands'
Expand Down
9 changes: 4 additions & 5 deletions eng/pipelines/scripts/Get-Linting-Commands.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ param(
[Parameter(Mandatory = $true)]
[string]$SourceBranch,

[Parameter(Mandatory = $true)]
[string]$TargetBranch,
[string]$TargetBranch = ("origin/${env:SYSTEM_PULLREQUEST_TARGETBRANCH}" -replace "refs/heads/"),

[Parameter(Mandatory = $true)]
[string]$LintingPipelineVariable
Expand All @@ -49,8 +48,8 @@ Write-Host "Source branch: ${SourceBranch}"
Write-Host "Target branch: ${TargetBranch}"
Write-Host "Linting pipeline variable: ${LintingPipelineVariable}"

if ($BuildReason -eq "Scheduled") {
Write-Host "Scheduled pipeline runs always use linting goals 'checkstyle:check revapi:check spotbugs:check'"
if ($BuildReason -ne "PullRequest") {
Write-Host "Non-PR pipeline runs always use linting goals 'checkstyle:check revapi:check spotbugs:check'"
Write-Host "##vso[task.setvariable variable=${LintingPipelineVariable};]checkstyle:check revapi:check spotbugs:check"
exit 0
}
Expand All @@ -59,7 +58,7 @@ $lintingGoals = ''
$baseDiffDirectory = 'eng/code-quality-reports/src/main'

$checkstyleSourceChanged = (git diff $TargetBranch $SourceBranch --name-only --relative -- "${baseDiffDirectory}/java/com/azure/tools/checkstyle/*").Count -gt 0
$checkstyleConfigChanged = (git diff $targetBranch $SourceBranch --name-only --relative -- "${baseDiffDirectory}/resources/checkstyle/*").Count -gt 0
$checkstyleConfigChanged = (git diff $TargetBranch $SourceBranch --name-only --relative -- "${baseDiffDirectory}/resources/checkstyle/*").Count -gt 0
if ($checkstyleSourceChanged -or $checkstyleConfigChanged) {
$lintingGoals += 'checkstyle:check'
}
Expand Down