Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .azure-pipelines/templates/macos/macos-build-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
echo "Architecture: $(Architecture)"
brew install python@${{ parameters.PythonVersion }}

PYTHON_PATH=$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python3
PYTHON_PATH=$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python
echo "Python path: $PYTHON_PATH"
$PYTHON_PATH --version

Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
brew install python@${{ parameters.PythonVersion }}
fi

AZ_PYTHON="$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python3"
AZ_PYTHON="$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python"
export AZ_PYTHON

echo "System architecture: $(uname -m)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ jobs:
brew install python@${{ parameters.PythonVersion }}
fi
AZ_PYTHON="$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python3"
AZ_PYTHON="$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python"
export AZ_PYTHON
export AZ_DEBUG=1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ jobs:
echo "=== Functional Test ==="
# Test CLI
if brew list python@${{ parameters.PythonVersion }} &>/dev/null; then
AZ_PYTHON="$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python3"
AZ_PYTHON="$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python"
export AZ_PYTHON
export AZ_DEBUG=1
if "$TEST_DIR/bin/az" version 2>&1 | head -5; then
Expand Down
6 changes: 3 additions & 3 deletions scripts/release/macos/build_binary_tar_gz.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ def _load_template(path: Path) -> str:
def find_homebrew_python() -> Path:
"""Find necessary Homebrew Python x.yz installation."""
candidates = [
Path(f"/opt/homebrew/opt/python@{PYTHON_MAJOR_MINOR}/libexec/bin/python3"),
Path(f"/usr/local/opt/python@{PYTHON_MAJOR_MINOR}/libexec/bin/python3"),
Path(f"/opt/homebrew/opt/python@{PYTHON_MAJOR_MINOR}/libexec/bin/python"),
Path(f"/usr/local/opt/python@{PYTHON_MAJOR_MINOR}/libexec/bin/python"),
Path(f"/opt/homebrew/bin/python{PYTHON_MAJOR_MINOR}"),
Path(f"/usr/local/bin/python{PYTHON_MAJOR_MINOR}"),
]
Expand All @@ -157,7 +157,7 @@ def find_homebrew_python() -> Path:
check=True,
)
prefix = Path(result.stdout.strip())
python_path = prefix / "libexec" / "bin" / "python3"
python_path = prefix / "libexec" / "bin" / "python"
if python_path.exists() and _is_python_version(python_path, PYTHON_MAJOR_MINOR):
print(f"Found Homebrew Python via brew --prefix: {python_path}")
return python_path
Expand Down
Loading