Skip to content

TypeSpec pipeline adjustment #24826

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
mikeharder merged 16 commits into from
Jul 20, 2023
Merged

TypeSpec pipeline adjustment #24826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
24b17cc
TypeSpec pipeline adjustment
ckairen Jul 14, 2023
2d36e52
adding root repo files
ckairen Jul 18, 2023
0f06486
testing
ckairen Jul 18, 2023
81d06ba
revert testing
ckairen Jul 18, 2023
780113f
windows separator
ckairen Jul 20, 2023
abfa00a
Merge branch 'main' into al/tsp-pipeline
mikeharder Jul 20, 2023
0c03c5b
Add debugging
mikeharder Jul 20, 2023
cb946e2
Fix typo
mikeharder Jul 20, 2023
9a04aef
Null check
mikeharder Jul 20, 2023
a09312b
Null check
mikeharder Jul 20, 2023
f5bc8dd
Temporarily disable git revert
mikeharder Jul 20, 2023
2464da9
Debug
mikeharder Jul 20, 2023
2084330
Fix typos
mikeharder Jul 20, 2023
44c7802
Revert git changes
mikeharder Jul 20, 2023
ead9873
Remove debug
mikeharder Jul 20, 2023
a2112ec
Rename "changed specs" to "impacted specs"
mikeharder Jul 20, 2023
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
14 changes: 0 additions & 14 deletions eng/pipelines/typespec-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,6 @@ trigger:
- main
- typespec-next

pr:
branches:
include:
- main
- typespec-next
paths:
include:
- .gitattributes
- .prettierrc.json
- package-lock.json
- package.json
- tsconfig.json
- eng

jobs:
- job: Validate_All_Specs
pool:
Expand Down
7 changes: 2 additions & 5 deletions eng/pipelines/typespec-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ pr:
include:
- main
- typespec-next
paths:
include:
- specification

jobs:
- job: Validate_Changed_Specs
- job: Validate_Impacted_Specs
pool:
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: ubuntu-22.04
Expand All @@ -28,5 +25,5 @@ jobs:
$(Build.SourcesDirectory) `
"origin/${env:SYSTEM_PULLREQUEST_TARGETBRANCH}" `
"${env:SYSTEM_PULLREQUEST_SOURCECOMMITID}"
displayName: Validate Changed Specs
displayName: Validate Impacted Specs
condition: succeededOrFailed()
19 changes: 15 additions & 4 deletions eng/scripts/Get-TypeSpec-Folders.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,31 @@ param (
)

$changedFiles = @()
$allChangedFiles = (Get-ChildItem -path ./specification tspconfig.yaml -Recurse).Directory.FullName | ForEach-Object {[IO.Path]::GetRelativePath($($pwd.path), $_)}
$allChangedFiles = $allChangedFiles -replace '\\', '/'

if ([string]::IsNullOrEmpty($TargetBranch) -or [string]::IsNullOrEmpty($SourceBranch)) {
$changedFiles = (Get-ChildItem -path ./specification tspconfig.yaml -Recurse).Directory.FullName | ForEach-Object {[IO.Path]::GetRelativePath($($pwd.path), $_)}
$changedFiles = $changedFiles -replace '\\', '/'
$changedFiles = $allChangedFiles
}
else {
Write-Host "git -c core.quotepath=off -c i18n.logoutputencoding=utf-8 diff --name-only `"$TargetBranch...$SourceBranch`" -- | Where-Object {`$_.StartsWith('specification')}"
$changedFiles = git -c core.quotepath=off -c i18n.logoutputencoding=utf-8 diff --name-only `"$TargetBranch...$SourceBranch`" -- | Where-Object {$_.StartsWith('specification')}
Write-Host "git -c core.quotepath=off -c i18n.logoutputencoding=utf-8 diff --name-only `"$TargetBranch...$SourceBranch`" --"
$changedFiles = git -c core.quotepath=off -c i18n.logoutputencoding=utf-8 diff --name-only `"$TargetBranch...$SourceBranch`" --
$changedFiles = $changedFiles -replace '\\', '/'

Write-Host "changedFiles:"
foreach ($changedFile in $changedFiles) {
Write-Host " $changedFile"
}
Write-Host

$engFiles = $changedFiles | Where-Object {if ($_) { $_.StartsWith('eng') }}

@weshaggard weshaggard Jul 21, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there cases where $_ is empty/null?

@mikeharder mikeharder Jul 21, 2023 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, all of the null checks in this PR were added to fix bugs we found in testing. It might be possible to refactor/rewrite the powershell code to be cleaner, but we wanted to get this merged in and working quickly. I don't understand exactly how PowerShell handles null/empty string, and it seems to be different depending which API you are using.

@mikeharder mikeharder Jul 21, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe $_ was empty/null specifically in the case where there was no git diff (e.g. a PR with no changes).

$repoRootFiles = $changedFiles | Where-Object {$_ -notmatch [Regex]::Escape([IO.Path]::DirectorySeparatorChar)}
if ($engFiles -or $repoRootFiles) {
$changedFiles = $allChangedFiles
}
else {
$changedFiles = $changedFiles | Where-Object {if ($_) { $_.StartsWith('specification') }}
}
}

$typespecFolders = @()
Expand Down