@@ -1,20 +1,61 @@
-#!/bin/bash
-
-python -m venv .env
+#!/usr/bin/env bash
+# Step 1: Create venv
+python${PYTHON_VERSION} -m venv .env
 source .env/bin/activate
-python -m pip install --upgrade pip
+python -m pip install "setuptools<68" wheel
 
-cd workers
+# Step 2: Install Bazel
+# Try system package manager first, otherwise fallback to binary download
+echo "=== Install Bazel ==="
+if command -v apt-get &>/dev/null; then
+  sudo apt-get update
+  sudo apt-get install -y bazel
+elif command -v brew &>/dev/null; then
+  brew install bazelisk   # macOS: bazelisk auto-tracks correct Bazel version
+else
+  BAZEL_VERSION=6.5.0
+  curl -LO "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-linux-x86_64"
+  chmod +x "bazel-${BAZEL_VERSION}-linux-x86_64"
+  sudo mv "bazel-${BAZEL_VERSION}-linux-x86_64" /usr/local/bin/bazel
+fi
+
+bazel --version
+
+echo "=== Checking Python version being used ==="
+python --version
+pip --version
+
+echo "=== Cloning grpc repo ==="
+if [ ! -d "grpc" ]; then
+    git clone --recursive https://github.com/grpc/grpc
+else
+    ( cd grpc && git fetch origin && git submodule update --init --recursive )
+fi
 
-# Build and install grpcio from source
-git clone --recursive https://github.com/grpc/grpc
 cd grpc
-python tools/distrib/python/make_grpcio_tools.py
-python tools/distrib/python/make_grpcio_wheel.py
-pip install artifacts/grpcio-*.whl
 
+echo "=== Building grpcio wheel with setup.py ==="
+python setup.py bdist_wheel -d dist
+
+echo "=== Checking built wheels ==="
+ls -la dist
+
+echo "=== Installing grpcio wheel into venv ==="
+for whl in dist/grpcio-*.whl; do
+    if [ -f "$whl" ]; then
+        echo "Installing wheel: $whl"
+        pip install "$whl"
+    else
+        echo "❌ No grpcio wheel found in dist/"
+        exit 1
+    fi
+done
 
+cd ..
+echo "=== Installing your workers package ==="
+cd workers
 python -m pip install .
+
 python -m pip install . --no-compile --target "$BUILD_SOURCESDIRECTORY/deps"
 
 python -m pip install invoke
 
@@ -1,22 +1,49 @@
 param (
     [string]$pythonVersion
 )
-$versionParts = $pythonVersion -split '\.'  # Splitting by dot
-$versionMinor = [int]$versionParts[1]
 
+# Create venv
 python -m venv .env
-.env\Scripts\Activate.ps1
-python -m pip install --upgrade pip
+. .env\Scripts\Activate.ps1
+python -m pip install "setuptools<68" wheel
 
-cd workers
+# Install Bazel
+choco install bazel --version=6.5.0 -y
+refreshenv
+bazel --version
+
+Write-Host "=== Checking Python version being used ==="
+.\.env\Scripts\python.exe --version
+.\.env\Scripts\pip.exe --version
+
+Write-Host "=== Cloning gRPC repo ==="
+if (-not (Test-Path "grpc")) {
+    git clone --recursive https://github.com/grpc/grpc
+} else {
+    cd grpc
+    Write-Host "Repo already exists. Updating submodules..."
+    git submodule update --init --recursive
+    cd ..
+}
 
-# Build and install grpcio from source
-git clone --recursive https://github.com/grpc/grpc
 cd grpc
-python tools\distrib\python\make_grpcio_tools.py
-python tools\distrib\python\make_grpcio_wheel.py
-pip install artifacts/grpcio-*.whl
 
+Write-Host "=== Building grpcio wheel with setup.py ==="
+..\.\.env\Scripts\python.exe setup.py bdist_wheel -d dist
+
+Write-Host "=== Checking built wheels ==="
+Get-ChildItem dist
+
+Write-Host "=== Installing grpcio wheel into venv ==="
+Get-ChildItem -Path "dist" -Filter "grpcio-*.whl" | ForEach-Object {
+    Write-Host "Installing wheel: $($_.FullName)"
+    ..\.\.env\Scripts\pip.exe install $_.FullName
+}
+
+cd ..
+
+# Go back to your project root and install your workers package
+Set-Location workers
 python -m pip install .
 
 $depsPath = Join-Path -Path $env:BUILD_SOURCESDIRECTORY -ChildPath "deps"
 
@@ -48,7 +48,7 @@ steps:
     args: '${{ parameters.pythonVersion }}'
   displayName: 'Build and install dependencies'
   condition: ne(variables['minorVersion'], '14')
-- task: PowerShell@2
+- task: ShellScript@2
   inputs:
     filePath: 'eng/pack/scripts/rc_mac_arm64_deps.sh'
     arguments: '${{ parameters.pythonVersion }}'