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

Updated automation script used in docker scenario #37447

Merged
merged 6 commits into from
Jul 13, 2023
Merged

Updated automation script used in docker scenario #37447

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3613f96
Updated automation script used in docker scenario
raych1 Jul 7, 2023
19e05d4
Pass in spec root dir to dotnet build
raych1 Jul 10, 2023
b52357d
Merge branch 'main' into user/raych1/update-scripts-used-in-docker
raych1 Jul 10, 2023
c33bd16
Merge branch 'main' into user/raych1/update-scripts-used-in-docker
raych1 Jul 12, 2023
fadd25e
Revert analyzer version change
raych1 Jul 12, 2023
32a5007
Ignore removing specification for pipeline scenario
raych1 Jul 13, 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
5 changes: 3 additions & 2 deletions eng/scripts/Invoke-GenerateAndBuildV2.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ if ($relatedTypeSpecProjectFolder) {
})
} else {
$relativeSdkPath = Resolve-Path $sdkProjectFolder -Relative
$specRepoRoot = $swaggerDir -replace "/specification", ""
raych1 marked this conversation as resolved.
Show resolved Hide resolved
raych1 marked this conversation as resolved.
Show resolved Hide resolved
if ($sdkProjectFolders -contains $sdkProjectFolder) {
# Existed SDK project case, needs to generate code
GeneratePackage `
Expand All @@ -135,7 +136,7 @@ if ($relatedTypeSpecProjectFolder) {
-downloadUrlPrefix $downloadUrlPrefix `
-serviceType "data-plane" `
-generatedSDKPackages $generatedSDKPackages `
-specRepoRoot $swaggerDir
-specRepoRoot $specRepoRoot
} else {
# New SDK project case, code is already generated by emitter. So, skip code generation
GeneratePackage `
Expand All @@ -146,7 +147,7 @@ if ($relatedTypeSpecProjectFolder) {
-serviceType "data-plane" `
-skipGenerate `
-generatedSDKPackages $generatedSDKPackages `
-specRepoRoot $swaggerDir
-specRepoRoot $specRepoRoot
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions eng/scripts/automation/Invoke-GenerateAndBuild.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ if ($relatedTypeSpecProjectFolder) {
})
} else {
$relativeSdkPath = Resolve-Path $sdkProjectFolder -Relative
$specRepoRoot = $swaggerDir -replace "/specification", ""
if ($sdkProjectFolders -contains $sdkProjectFolder) {
# Existed SDK project case, needs to generate code
GeneratePackage `
Expand All @@ -94,7 +95,7 @@ if ($relatedTypeSpecProjectFolder) {
-downloadUrlPrefix $downloadUrlPrefix `
-serviceType "data-plane" `
-generatedSDKPackages $generatedSDKPackages `
-specRepoRoot $swaggerDir
-specRepoRoot $specRepoRoot
} else {
# New SDK project case, code is already generated by emitter. So, skip code generation
GeneratePackage `
Expand All @@ -105,7 +106,7 @@ if ($relatedTypeSpecProjectFolder) {
-serviceType "data-plane" `
-skipGenerate `
-generatedSDKPackages $generatedSDKPackages `
-specRepoRoot $swaggerDir
-specRepoRoot $specRepoRoot
}
}
}
Expand Down