Skip to content

Al/tsv noop #24825

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

Al/tsv noop #24825

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
315855a
testing
ckairen Jul 14, 2023
632a2c6
tsv noop on no typespec diff
ckairen Jul 14, 2023
dd16d3d
windows linux directory slash
ckairen Jul 14, 2023
8dc59c9
test
ckairen Jul 14, 2023
6331a77
escaping backward slash for regex
ckairen Jul 14, 2023
764a709
avoid null array
ckairen Jul 14, 2023
6103296
fix index null array bug
ckairen Jul 14, 2023
c5a59b6
stringify osslash
ckairen Jul 14, 2023
46b5f85
regex escape
ckairen Jul 14, 2023
d4a22cf
tsv path separator
ckairen Jul 14, 2023
c9c2596
test
ckairen Jul 14, 2023
8bcf644
revert testing
ckairen Jul 14, 2023
974a65e
cleaner windows separator
ckairen Jul 18, 2023
4647d0e
windwos separator sanitization
ckairen Jul 18, 2023
e77e126
debug
ckairen Jul 19, 2023
b5a52c0
Merge branch 'main' into al/tsv-noop
ckairen Jul 19, 2023
3ad7a22
get dir
ckairen Jul 19, 2023
834e1de
Update eng/pipelines/typespec-ci.yml
ckairen Jul 19, 2023
bf7de41
Update eng/pipelines/typespec-ci.yml
ckairen Jul 19, 2023
921431a
replace
ckairen Jul 20, 2023
120b45d
windows testing
ckairen Jul 20, 2023
57a5fa4
Update eng/pipelines/typespec-ci.yml
ckairen Jul 20, 2023
9fa7685
Update eng/pipelines/typespec-ci.yml
ckairen Jul 20, 2023
af3dee7
Handle null $typespecFolders
mikeharder Jul 20, 2023
b800d8d
Add debugging, assign changedFiles
mikeharder Jul 20, 2023
c59fb0b
Only print changes files if git diff
mikeharder Jul 20, 2023
455aa5a
Check path empty
mikeharder Jul 20, 2023
cf1f53d
Merge branch 'main' into al/tsv-noop
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: 12 additions & 2 deletions eng/pipelines/typespec-ci.yml
View file
Open in desktop
Comment thread
ckairen marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,19 @@ pr:

jobs:
- job: Validate_All_Specs

strategy:
matrix:
Linux:
Pool: azsdk-pool-mms-ubuntu-2204-general
OsVmImage: ubuntu-22.04
Windows:
Comment thread
weshaggard marked this conversation as resolved.
Outdated
Pool: azsdk-pool-mms-win-2022-general
OsVmImage: windows-2022
Comment thread
ckairen marked this conversation as resolved.
Outdated

Comment thread
ckairen marked this conversation as resolved.
Outdated
pool:
name: azsdk-pool-mms-ubuntu-2204-general
vmImage: ubuntu-22.04
name: $(Pool)
vmImage: $(OSVmImage)
Comment thread
ckairen marked this conversation as resolved.
Outdated
Comment thread
ckairen marked this conversation as resolved.
Outdated

steps:
- script: npm ci
Expand Down
9 changes: 6 additions & 3 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,8 +9,9 @@ param (
)

$tspFiles = @()
$osSlash = [IO.Path]::DirectorySeparatorChar
if ([string]::IsNullOrEmpty($TargetBranch) -or [string]::IsNullOrEmpty($SourceBranch)) {
$tspFiles = (Get-ChildItem -path ./specification tspconfig.yaml -Recurse).FullName -replace "$($pwd.Path)/"
$tspFiles = (Get-ChildItem -path ./specification tspconfig.yaml -Recurse).FullName -replace [Regex]::Escape("$($pwd.Path)$osSlash")
Comment thread
ckairen marked this conversation as resolved.
Outdated
}
else {
Write-Host "git -c core.quotepath=off -c i18n.logoutputencoding=utf-8 diff --name-only `"$TargetBranch...$SourceBranch`" -- | Where-Object {`$_.StartsWith('specification')}"
Comment thread
weshaggard marked this conversation as resolved.
Expand All @@ -19,8 +20,10 @@ else {

$typespecFolders = @()
foreach ($file in $tspFiles) {
$file -match 'specification\/[^\/]*\/' | out-null
$typespecFolders += (Get-ChildItem -path $matches[0] tspconfig.yaml -Recurse).Directory.FullName -replace "$($pwd.Path)/"
$file -match "specification\$osSlash[^\$osSlash]*\$osSlash" | out-null
if ($matches) {
$typespecFolders += (Get-ChildItem -path $matches[0] tspconfig.yaml -Recurse).Directory.FullName -replace [Regex]::Escape("$($pwd.Path)$osSlash")
}
Comment thread
ckairen marked this conversation as resolved.
Outdated
}
$typespecFolders = $typespecFolders | Select-Object -Unique

Expand Down
1 change: 1 addition & 0 deletions eng/scripts/Validate-TypeSpec.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ param (
$typespecFolders = @()

$typespecFolders = &"$PSScriptRoot/Get-TypeSpec-Folders.ps1" "$SpecsRepoRootDirectory" "$TargetBranch" "$SourceBranch"
$typespecFolders = $typespecFolders.Split('',[System.StringSplitOptions]::RemoveEmptyEntries)
Comment thread
ckairen marked this conversation as resolved.
Outdated

$exitCode = 0
foreach ($typespecFolder in $typespecFolders) {
Expand Down
2 changes: 1 addition & 1 deletion eng/tools/TypeSpecValidation/src/TypeSpecValidation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export async function main() {
}

// Format parent folder to include shared files
await runCmd(`npx tsp format ../**/*.tsp`, folder);
await runCmd(`npx tsp format ..${path.sep}**${path.sep}*.tsp`, folder);
Comment thread
ckairen marked this conversation as resolved.
Outdated

// Verify generated swagger file is in sync with one on disk
const git = simpleGit();
Expand Down