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

Jump to bottom

Fixed the printing message. #22301

Merged
merged 11 commits into from
Jan 6, 2022
Merged

Fixed the printing message. #22301

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4a3b2a5
Fixed the printing message.
sima-zhu Jan 3, 2022
dc0adae
add variable
sima-zhu Jan 3, 2022
aa340f7
initiate the message.
sima-zhu Jan 3, 2022
5fcc028
for debugging
sima-zhu Jan 3, 2022
6886cd4
Update Language-Settings.ps1
sima-zhu Jan 5, 2022
e982f3c
Update Language-Settings.ps1
sima-zhu Jan 5, 2022
e0591cd
Update Language-Settings.ps1
sima-zhu Jan 5, 2022
9857609
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python …
sima-zhu Jan 5, 2022
44e4401
Update Language-Settings.ps1
sima-zhu Jan 5, 2022
1105789
Update eng/scripts/Language-Settings.ps1
sima-zhu Jan 6, 2022
25740a2
Update eng/scripts/Language-Settings.ps1
sima-zhu Jan 6, 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
19 changes: 11 additions & 8 deletions eng/scripts/Language-Settings.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,24 +204,27 @@ function DockerValidation{
[string]$workingDirectory
)
if ($PackageSourceOverride) {
docker run -v "${workingDirectory}:/workdir/out" -e TARGET_PACKAGE=$packageName -e TARGET_VERSION=$packageVersion `
-e EXTRA_INDEX_URL=$PackageSourceOverride -t $DocValidationImageId 2>&1 | Out-Null
Write-Host "docker run -v ${workingDirectory}:/workdir/out -e TARGET_PACKAGE=$packageName -e TARGET_VERSION=$packageVersion -e EXTRA_INDEX_URL=$PackageSourceOverride -t $DocValidationImageId"
$commandLine = docker run -v "${workingDirectory}:/workdir/out" -e TARGET_PACKAGE=$packageName -e TARGET_VERSION=$packageVersion `
-e EXTRA_INDEX_URL=$PackageSourceOverride -t $DocValidationImageId 2>&1
}
else {
docker run -v "${workingDirectory}:/workdir/out" `
-e TARGET_PACKAGE=$packageName -e TARGET_VERSION=$packageVersion -t $DocValidationImageId 2>&1 | Out-Null
Write-Host "docker run -v ${workingDirectory}:/workdir/out -e TARGET_PACKAGE=$packageName -e TARGET_VERSION=$packageVersion -t $DocValidationImageId"
$commandLine = docker run -v "${workingDirectory}:/workdir/out" `
-e TARGET_PACKAGE=$packageName -e TARGET_VERSION=$packageVersion -t $DocValidationImageId 2>&1
}
# The docker exit codes: https://docs.docker.com/engine/reference/run/#exit-status
# If the docker failed because of docker itself instead of the application,
# we should skip the validation and keep the packages.

if ($LASTEXITCODE -eq 125 -Or $LASTEXITCODE -eq 126 -Or $LASTEXITCODE -eq 127) {
Write-Host $commandLine
$commandLine | ForEach-Object { Write-Debug $_ }
LogWarning "The `docker` command does not work with exit code $LASTEXITCODE. Fall back to npm install $packageName directly."
FallbackValidation -packageName "$packageName" -packageVersion "$packageVersion" -workingDirectory $workingDirectory -PackageSourceOverride $PackageSourceOverride
}
elseif ($LASTEXITCODE -ne 0) {
Write-Host $commandLine
LogWarning "Package $($Package.name) ref docs validation failed."
$commandLine | ForEach-Object { Write-Debug $_ }
LogWarning "Package $packageName ref docs validation failed."
return $false
}
return $true
Expand Down Expand Up @@ -566,4 +569,4 @@ function Validate-Python-DocMsPackages ($PackageInfo, $PackageSourceOverride, $D
$packageVersion = $packageInfo.Version
ValidatePackage -packageName $packageName -packageVersion $packageVersion `
-PackageSourceOverride $PackageSourceOverride -DocValidationImageId $DocValidationImageId
}
}