Address Copilot PR review round 2: template python version, env var for PYTHON_MAJOR_MINOR, fix arithmetic exit code

Author: naga-nandyala

.azure-pipelines/templates/macos/macos-cask-generation-and-tests.yml

@@ -140,6 +140,7 @@ jobs:
         --arm64-sha "$ARM64_SHA256" \
         --x86-64-sha "$X86_64_SHA256" \
         --github-repo "${{ parameters.GitHubRepo }}" \
+        --python-version "${{ parameters.PythonVersion }}" \
         --template "$REPO_ROOT/scripts/release/macos/templates/azure-cli.rb.in" \
         --output "$(Pipeline.Workspace)/macos-cask-definition/azure-cli.rb"
       

.azure-pipelines/templates/macos/macos-sign-notarize-jobs.yml

@@ -618,26 +618,26 @@ jobs:
         
         # 1. Basic signature check
         if codesign -v "$file" 2>/dev/null; then
-          ((SIGNED_COUNT++))
+          SIGNED_COUNT=$((SIGNED_COUNT + 1))
           [ -z "$FIRST_SIGNED" ] && FIRST_SIGNED="$file"
           
           # 2. Strict verification (only for signed files)
           if codesign --verify --deep --strict "$file" 2>/dev/null; then
-            ((STRICT_PASS++))
+            STRICT_PASS=$((STRICT_PASS + 1))
           else
-            ((STRICT_FAIL++))
+            STRICT_FAIL=$((STRICT_FAIL + 1))
             STRICT_FAILED_FILES+=("$filename")
           fi
           
           # 3. Developer ID check (only for signed files)
           if codesign -dvv "$file" 2>&1 | grep -q "Developer ID"; then
-            ((DEVID_PASS++))
+            DEVID_PASS=$((DEVID_PASS + 1))
           else
-            ((DEVID_FAIL++))
+            DEVID_FAIL=$((DEVID_FAIL + 1))
             DEVID_FAILED_FILES+=("$filename")
           fi
         else
-          ((UNSIGNED_COUNT++))
+          UNSIGNED_COUNT=$((UNSIGNED_COUNT + 1))
           UNSIGNED_FILES+=("$filename")
         fi
       done

scripts/release/macos/build_binary_tar_gz.py

@@ -50,6 +50,7 @@
 
 import argparse
 import hashlib
+import os
 import shutil
 import subprocess
 import sys
@@ -68,8 +69,9 @@
 CLI_EXECUTABLE_NAME = "az"
 TARBALL_NAME_TEMPLATE_DEFAULT = "{APP_NAME}-{VERSION}-{PLATFORM_TAG}-nopython.tar.gz"
 
-# Python version we're building for (must match Homebrew python@3.13)
-PYTHON_MAJOR_MINOR = "3.13"
+# Python version we're building for (must match Homebrew python@X.Y)
+# Can be overridden via --python-version CLI arg or PYTHON_MAJOR_MINOR env var
+PYTHON_MAJOR_MINOR = os.environ.get("PYTHON_MAJOR_MINOR", "3.13")
 PYTHON_BIN = "python3"
 TEMPLATE_DIR = Path(__file__).resolve().parent / "templates"
 LAUNCHER_TEMPLATE_PATH = TEMPLATE_DIR / "az_launcher.sh.in"

scripts/release/macos/cask_generate.py

@@ -54,6 +54,7 @@ def generate_cask(args: argparse.Namespace) -> None:
     arm64_sha = _require(_env_or_arg(args.arm64_sha, "ARM64_SHA"), "arm64_sha")
     x86_64_sha = _require(_env_or_arg(args.x86_64_sha, "X86_64_SHA"), "x86_64_sha")
     github_repo = _require(_env_or_arg(args.github_repo, "GITHUB_REPO"), "github_repo")
+    python_version = _require(_env_or_arg(args.python_version, "PYTHON_VERSION"), "python_version")
 
     template_path = Path(_env_or_arg(args.template, "TEMPLATE") or DEFAULT_TEMPLATE)
     output_path = Path(_env_or_arg(args.output, "OUTPUT") or DEFAULT_OUTPUT)
@@ -63,6 +64,7 @@ def generate_cask(args: argparse.Namespace) -> None:
         "{{ arm64_sha }}": arm64_sha,
         "{{ x86_64_sha }}": x86_64_sha,
         "{{ github_repo }}": github_repo,
+        "{{ python_version }}": python_version,
     }
 
     content = _render_template(template_path, replacements)
@@ -75,6 +77,7 @@ def main() -> None:
     parser.add_argument("--arm64-sha", dest="arm64_sha", help="ARM64 tarball SHA256")
     parser.add_argument("--x86-64-sha", dest="x86_64_sha", help="x86_64 tarball SHA256")
     parser.add_argument("--github-repo", dest="github_repo", help="GitHub repo, e.g. Azure/azure-cli")
+    parser.add_argument("--python-version", dest="python_version", help="Python major.minor version, e.g. 3.13")
     parser.add_argument("--template", dest="template", help="Template path (.rb.in)")
     parser.add_argument("--output", dest="output", help="Output cask path (.rb)")
     parser.set_defaults(func=generate_cask)

scripts/release/macos/templates/azure-cli.rb.in

@@ -16,7 +16,7 @@ cask "azure-cli" do
     strategy :github_latest
   end
 
-  depends_on formula: "python@3.13"
+  depends_on formula: "python@{{ python_version }}"
 
   binary "bin/az"