Skip to content

Commit 4c0a3be

Browse files
committed
Fix vision builds
1 parent d7b46d5 commit 4c0a3be

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

.github/actions/setup-binary-builds/action.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,21 @@ runs:
127127
CONDA_ENV="${RUNNER_TEMP}/conda_environment_${GITHUB_RUN_ID}"
128128
export CONDA_EXTRA_PARAM=""
129129
130-
if [[ ( "${PYTHON_VERSION:-}" == *t || "${PYTHON_VERSION:-}" == 3.14* ) && "$(uname)" == Darwin ]]; then
131-
# downgrade conda version for python 3.13t/3.14t install.
132-
# TODO: remove this once python 3.13t/3.14t is fully supported on conda
130+
if [[ ( "${PYTHON_VERSION:-}" == *t || "${PYTHON_VERSION:-}" == 3.14* ) ]]; then
131+
132+
# downgrade conda version for python 3.13t install.
133+
# TODO: remove this once python 3.13t is fully supported on conda
133134
# Please see : https://github.com/conda/conda/issues/14554
134-
conda install -y python=3.9
135-
if [[ -n "$(conda list | grep conda-anaconda-telemetry)" ]]; then
136-
conda uninstall -y conda-anaconda-telemetry conda-anaconda-tos
135+
if [[ "$(uname)" == Darwin ]]; then
136+
# required to be able to downgrade on MacOS arm64
137+
conda install -y python=3.9
138+
if [[ -n "$(conda list | grep conda-anaconda-telemetry)" ]]; then
139+
conda uninstall -y conda-anaconda-telemetry conda-anaconda-tos
140+
fi
141+
conda install -y conda=24.7.1 conda-libmamba-solver=24.1.0
142+
else
143+
conda install -y conda=24.7.1
137144
fi
138-
conda install -y conda=24.7.1 conda-libmamba-solver=24.1.0
139145
fi
140146
141147
# shellcheck disable=SC2153

tools/scripts/generate_binary_build_matrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ def generate_wheels_matrix(
455455
arches += [XPU]
456456

457457
if limit_pr_builds:
458-
python_versions = [python_versions[0]]
458+
python_versions = ["3.13t", "3.14t", "3.14"]
459459

460460
global WHEEL_CONTAINER_IMAGES
461461

0 commit comments

Comments
 (0)