From 94afb4776a46788c1c275ee758caa13e1200e728 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Tue, 4 Mar 2025 19:35:17 -0800
Subject: [PATCH 1/3] Fix for vision failue on MacOS M1 machines

---
 .github/actions/setup-binary-builds/action.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/actions/setup-binary-builds/action.yml b/.github/actions/setup-binary-builds/action.yml
index 7cbadbc9e8..c137623392 100644
--- a/.github/actions/setup-binary-builds/action.yml
+++ b/.github/actions/setup-binary-builds/action.yml
@@ -118,6 +118,8 @@ runs:
       - name: Generate file from pytorch_pkg_helpers
         working-directory: ${{ inputs.repository }}
         shell: bash -l {0}
+        env:
+          PYTHON_VERSION: ${{ inputs.python-version }}
         run: |
           set -euxo pipefail
           CONDA_ENV="${RUNNER_TEMP}/pytorch_pkg_helpers_${GITHUB_RUN_ID}"
@@ -132,6 +134,13 @@ runs:
           ${CONDA_RUN} python -m pytorch_pkg_helpers > "${BUILD_ENV_FILE}"
           cat "${BUILD_ENV_FILE}"
           echo "BUILD_ENV_FILE=${BUILD_ENV_FILE}" >> "${GITHUB_ENV}"
+
+          # downgrade conda version for python 3.13t install.
+          # TODO: remove this once python 3.13t is fully suported on conda
+          # Please see : https://github.com/conda/conda/issues/14554
+          if [[ "${PYTHON_VERSION:-}" == "3.13t" ]]; then
+            ${CONDA_RUN} conda install -y conda=24.7.1 conda-libmamba-solver=24.1.0
+          fi
       - name: Setup conda environment for build
         shell: bash -l {0}
         env:
@@ -144,12 +153,6 @@ runs:
           if [[ "${PYTHON_VERSION:-}" == "3.13t" ]]; then
             export PYTHON_VERSION=3.13
             export CONDA_EXTRA_PARAM=" python-freethreading -c conda-forge"
-            if [[ "$(uname)" != Darwin ]]; then
-              # Pin conda and conda-libmamba-solver for 3.13t linux build
-              # this solver allows us to install anaconda dependencies on
-              # python-freethreading on conda-forge environment
-              conda install conda==24.7.1 conda-libmamba-solver=24.1.0
-            fi
           fi
 
           conda create \

From d2b5b0370dbe6212e477fbf4a1e22a1aeb34df9f Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Wed, 5 Mar 2025 10:18:27 -0800
Subject: [PATCH 2/3] fix

---
 .github/actions/setup-binary-builds/action.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/actions/setup-binary-builds/action.yml b/.github/actions/setup-binary-builds/action.yml
index c137623392..3dabb0e4a0 100644
--- a/.github/actions/setup-binary-builds/action.yml
+++ b/.github/actions/setup-binary-builds/action.yml
@@ -134,13 +134,6 @@ runs:
           ${CONDA_RUN} python -m pytorch_pkg_helpers > "${BUILD_ENV_FILE}"
           cat "${BUILD_ENV_FILE}"
           echo "BUILD_ENV_FILE=${BUILD_ENV_FILE}" >> "${GITHUB_ENV}"
-
-          # downgrade conda version for python 3.13t install.
-          # TODO: remove this once python 3.13t is fully suported on conda
-          # Please see : https://github.com/conda/conda/issues/14554
-          if [[ "${PYTHON_VERSION:-}" == "3.13t" ]]; then
-            ${CONDA_RUN} conda install -y conda=24.7.1 conda-libmamba-solver=24.1.0
-          fi
       - name: Setup conda environment for build
         shell: bash -l {0}
         env:
@@ -153,6 +146,16 @@ runs:
           if [[ "${PYTHON_VERSION:-}" == "3.13t" ]]; then
             export PYTHON_VERSION=3.13
             export CONDA_EXTRA_PARAM=" python-freethreading -c conda-forge"
+
+            # downgrade conda version for python 3.13t install.
+            # TODO: remove this once python 3.13t is fully suported on conda
+            # Please see : https://github.com/conda/conda/issues/14554
+            if [[ "$(uname)" == Darwin ]]; then
+              # required to be able to downgrade on MacOS m1 side
+              conda install -y python=3.9
+              conda uninstall -y conda-anaconda-telemetry conda-anaconda-tos
+            fi
+            conda install -y conda=24.7.1 conda-libmamba-solver=24.1.0
           fi
 
           conda create \

From 713b74e79576da245b35d16944dd9ff8ec8a9493 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Wed, 5 Mar 2025 10:19:06 -0800
Subject: [PATCH 3/3] fix

---
 .github/actions/setup-binary-builds/action.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/actions/setup-binary-builds/action.yml b/.github/actions/setup-binary-builds/action.yml
index 3dabb0e4a0..fbcb49a315 100644
--- a/.github/actions/setup-binary-builds/action.yml
+++ b/.github/actions/setup-binary-builds/action.yml
@@ -118,8 +118,6 @@ runs:
       - name: Generate file from pytorch_pkg_helpers
         working-directory: ${{ inputs.repository }}
         shell: bash -l {0}
-        env:
-          PYTHON_VERSION: ${{ inputs.python-version }}
         run: |
           set -euxo pipefail
           CONDA_ENV="${RUNNER_TEMP}/pytorch_pkg_helpers_${GITHUB_RUN_ID}"