Skip to content

Commit 7bf2b35

Browse files
committed
remove grpc check for linux-arm64
1 parent b9d5df6 commit 7bf2b35

File tree

2 files changed

+18
-45
lines changed

2 files changed

+18
-45
lines changed

eng/pack/templates/nix_arm64_env_gen.yml

Lines changed: 17 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
pythonVersion: ''
33
artifactName: ''
4-
grpcBuild: []
4+
grpcBuild: ''
55

66
steps:
77
- task: UsePythonVersion@0
@@ -147,26 +147,14 @@ steps:
147147
}
148148
}
149149
# === gRPC check ===
150-
$grpcPatterns = @()
150+
$grpcPattern = "*$(majorVersion)$(minorVersion)-${{ parameters.grpcBuild }}"
151+
$grpcMatch = Get-ChildItem -Path $cythonDir -Name -ErrorAction SilentlyContinue |
152+
Where-Object { $_ -like $grpcPattern }
151153
152-
foreach ($build in @(${ { parameters.grpcBuild } })) {
153-
$grpcPatterns += "*$($majorVersion)$($minorVersion)-$build"
154-
}
155-
156-
$found = $false
157-
158-
foreach ($pattern in $grpcPatterns) {
159-
$grpcMatch = Get-ChildItem -Path $cythonDir -Name -ErrorAction SilentlyContinue |
160-
Where-Object { $_ -like $pattern }
161-
162-
if ($grpcMatch) {
163-
Write-Host "✅ Found gRPC binary: $grpcMatch"
164-
$found = $true
165-
}
166-
}
167-
168-
if (-not $found) {
169-
$missing += "grpc/_cython/$($grpcPatterns -join ', ')"
154+
if (-not $grpcMatch) {
155+
$missing += "grpc/_cython/$grpcPattern"
156+
} else {
157+
Write-Host "✅ Found gRPC binary: $grpcMatch"
170158
}
171159
172160
if ($missing.Count -gt 0) {
@@ -226,7 +214,6 @@ steps:
226214
"proxy_worker/protos/shared/NullableTypes_pb2.py",
227215
"proxy_worker/protos/shared/NullableTypes_pb2_grpc.py",
228216
"six.py",
229-
"uvloop",
230217
"werkzeug",
231218
"worker.py"
232219
)
@@ -239,28 +226,16 @@ steps:
239226
$missing += $item
240227
}
241228
}
242-
# === gRPC check ===
243-
$grpcPatterns = @()
229+
# # === gRPC check ===
230+
# $grpcPattern = "*$(majorVersion)$(minorVersion)-${{ parameters.grpcBuild }}"
231+
# $grpcMatch = Get-ChildItem -Path $cythonDir -Name -ErrorAction SilentlyContinue |
232+
# Where-Object { $_ -like $grpcPattern }
244233
245-
foreach ($build in @(${ { parameters.grpcBuild } })) {
246-
$grpcPatterns += "*$($majorVersion)$($minorVersion)-$build"
247-
}
248-
249-
$found = $false
250-
251-
foreach ($pattern in $grpcPatterns) {
252-
$grpcMatch = Get-ChildItem -Path $cythonDir -Name -ErrorAction SilentlyContinue |
253-
Where-Object { $_ -like $pattern }
254-
255-
if ($grpcMatch) {
256-
Write-Host "✅ Found gRPC binary: $grpcMatch"
257-
$found = $true
258-
}
259-
}
260-
261-
if (-not $found) {
262-
$missing += "grpc/_cython/$($grpcPatterns -join ', ')"
263-
}
234+
# if (-not $grpcMatch) {
235+
# $missing += "grpc/_cython/$grpcPattern"
236+
# } else {
237+
# Write-Host "✅ Found gRPC binary: $grpcMatch"
238+
# }
264239
265240
if ($missing.Count -gt 0) {
266241
Write-Error "Validation failed. Missing expected files/folders:`n$($missing -join "`n")"

eng/templates/official/jobs/build-artifacts.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,7 @@ jobs:
252252
parameters:
253253
pythonVersion: '$(pythonVersion)'
254254
artifactName: '$(normalizedPythonVersion)_LINUX_ARM64'
255-
grpcBuild:
256-
- 'aarch64-linux-gnu.so'
257-
- 'aarch64-linux-musl.so'
255+
grpcBuild: 'aarch64-linux-gnu.so'
258256

259257
- job: PackageWorkers
260258
dependsOn: ['Build_WINDOWS_X64', 'Build_WINDOWS_X86', 'Build_LINUX_X64', 'Build_OSX_X64', 'Build_OSX_ARM64', 'Build_LINUX_ARM64']

0 commit comments

Comments
 (0)