From 6e56736e8c7eedca680c5c24ab615f254c1166b8 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Wed, 2 Jul 2025 09:12:00 -0700
Subject: [PATCH 01/32] Cleanup leftover miniconda brew installation

---
 .github/workflows/build_wheels_macos.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 720542cef4..9f0b3abddb 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -117,6 +117,9 @@ jobs:
           rm -rfv "${GITHUB_WORKSPACE}"
           mkdir -p "${GITHUB_WORKSPACE}"
           echo "::endgroup::"
+      - name: Clean up leftover miniconda installation
+        continue-on-error: true
+        run: brew uninstall miniconda || true
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Support the use case where we need to checkout someone's fork

From f4c9f8e1b11dc2c8a669e63f6e5b2d1283a94faf Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 3 Jul 2025 07:50:03 -0700
Subject: [PATCH 02/32] test

---
 .github/workflows/build_wheels_macos.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 9f0b3abddb..57f3cfe5f2 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -119,7 +119,12 @@ jobs:
           echo "::endgroup::"
       - name: Clean up leftover miniconda installation
         continue-on-error: true
-        run: brew uninstall miniconda || true
+        shell: bash -l {0}
+        run: |
+          conda deactivate
+          conda config --remove-key "auto_activate_base"
+          conda init bash --reverse
+          brew uninstall miniconda || true
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Support the use case where we need to checkout someone's fork

From 7bf46a8fd399781a0485d47a5a36e384213bfaf4 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 3 Jul 2025 07:59:36 -0700
Subject: [PATCH 03/32] test

---
 .github/workflows/build_wheels_macos.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 57f3cfe5f2..62494c1b14 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -121,6 +121,7 @@ jobs:
         continue-on-error: true
         shell: bash -l {0}
         run: |
+          echo ${PATH}
           conda deactivate
           conda config --remove-key "auto_activate_base"
           conda init bash --reverse

From 17be1a6f6586b1f7cac001e4d046ac1542e699ab Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 3 Jul 2025 08:18:07 -0700
Subject: [PATCH 04/32] test

---
 .github/workflows/build_wheels_macos.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 62494c1b14..dd5f85f437 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -126,6 +126,7 @@ jobs:
           conda config --remove-key "auto_activate_base"
           conda init bash --reverse
           brew uninstall miniconda || true
+          export PATH="/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/opt/homebrew/bin:/opt/homebrew/sbin"
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Support the use case where we need to checkout someone's fork

From 4d777be076744b50e95ebc2f9cbe395a7945fda9 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 3 Jul 2025 08:22:31 -0700
Subject: [PATCH 05/32] test

---
 .github/workflows/build_wheels_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index dd5f85f437..02816d81f7 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -126,7 +126,7 @@ jobs:
           conda config --remove-key "auto_activate_base"
           conda init bash --reverse
           brew uninstall miniconda || true
-          export PATH="/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/opt/homebrew/bin:/opt/homebrew/sbin"
+          export PATH="/Users/ec2-user/miniconda3/bin/conda:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/opt/homebrew/bin:/opt/homebrew/sbin"
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Support the use case where we need to checkout someone's fork

From b2b195e9df64568b2eab68b053757477cd89e0ee Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 3 Jul 2025 08:27:18 -0700
Subject: [PATCH 06/32] test

---
 .github/workflows/build_wheels_macos.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 02816d81f7..9f3928abc3 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -158,6 +158,7 @@ jobs:
         if: ${{ inputs.delocate-wheel }}
         run: |
           set -euxo pipefail
+          conda info
           ${CONDA_RUN} python3 -m pip install delocate==0.10.7
       - name: Install torch dependency
         run: |

From d97ecb03eaccd372480c246c21c4f892c7a58550 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 3 Jul 2025 08:54:56 -0700
Subject: [PATCH 07/32] test

---
 .github/workflows/build_wheels_macos.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 9f3928abc3..55f3add694 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -159,6 +159,7 @@ jobs:
         run: |
           set -euxo pipefail
           conda info
+          conda env list
           ${CONDA_RUN} python3 -m pip install delocate==0.10.7
       - name: Install torch dependency
         run: |

From 20b3b645ac3c511d0e25f2b7ecff2b808cb48e8a Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 3 Jul 2025 08:58:27 -0700
Subject: [PATCH 08/32] test

---
 .github/workflows/build_wheels_macos.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 55f3add694..b96b726c67 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -160,6 +160,7 @@ jobs:
           set -euxo pipefail
           conda info
           conda env list
+          conda activate base
           ${CONDA_RUN} python3 -m pip install delocate==0.10.7
       - name: Install torch dependency
         run: |

From 2400a06da7f4073ad1e47554024eab21d1eff60b Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 3 Jul 2025 10:47:06 -0700
Subject: [PATCH 09/32] test

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

diff --git a/.github/actions/setup-binary-builds/action.yml b/.github/actions/setup-binary-builds/action.yml
index 94ce5d451b..133ce9a441 100644
--- a/.github/actions/setup-binary-builds/action.yml
+++ b/.github/actions/setup-binary-builds/action.yml
@@ -88,6 +88,8 @@ runs:
         if: ${{ inputs.setup-miniconda == 'true' }}
         uses: conda-incubator/setup-miniconda@v3.1.1
         with:
+          auto-activate-base: true
+          activate-environment: ""
           miniconda-version: "latest"
           python-version: 3.9
       - name: Clean conda environment

From af8762317b5d07749a0d43dd8cacb616f97be697 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 3 Jul 2025 10:59:07 -0700
Subject: [PATCH 10/32] test

---
 .github/actions/setup-binary-builds/action.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/actions/setup-binary-builds/action.yml b/.github/actions/setup-binary-builds/action.yml
index 133ce9a441..f1b14bc25c 100644
--- a/.github/actions/setup-binary-builds/action.yml
+++ b/.github/actions/setup-binary-builds/action.yml
@@ -88,10 +88,8 @@ runs:
         if: ${{ inputs.setup-miniconda == 'true' }}
         uses: conda-incubator/setup-miniconda@v3.1.1
         with:
-          auto-activate-base: true
-          activate-environment: ""
           miniconda-version: "latest"
-          python-version: 3.9
+          python-version: 3.12
       - name: Clean conda environment
         shell: bash -l {0}
         run: |

From b5606dac0166f964fd3c0404166e9fb27658364d Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 3 Jul 2025 11:11:21 -0700
Subject: [PATCH 11/32] zap

---
 .github/workflows/build_wheels_macos.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index b96b726c67..b161a6e777 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -121,12 +121,7 @@ jobs:
         continue-on-error: true
         shell: bash -l {0}
         run: |
-          echo ${PATH}
-          conda deactivate
-          conda config --remove-key "auto_activate_base"
-          conda init bash --reverse
-          brew uninstall miniconda || true
-          export PATH="/Users/ec2-user/miniconda3/bin/conda:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/opt/homebrew/bin:/opt/homebrew/sbin"
+          brew uninstall --cask --zap --force miniconda || true
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Support the use case where we need to checkout someone's fork
@@ -160,7 +155,6 @@ jobs:
           set -euxo pipefail
           conda info
           conda env list
-          conda activate base
           ${CONDA_RUN} python3 -m pip install delocate==0.10.7
       - name: Install torch dependency
         run: |

From 04a11390e2293f46afad18e3d93f79f213307367 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 3 Jul 2025 11:37:41 -0700
Subject: [PATCH 12/32] remove

---
 .github/workflows/build_wheels_macos.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index b161a6e777..77365f83e9 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -122,6 +122,7 @@ jobs:
         shell: bash -l {0}
         run: |
           brew uninstall --cask --zap --force miniconda || true
+          rm -rf /opt/homebrew/Caskroom/miniconda/base || true
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Support the use case where we need to checkout someone's fork

From 034d56888fd9b62daa27e4924308c18d3716877b Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 09:54:08 -0400
Subject: [PATCH 13/32] Update .github/workflows/build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 77365f83e9..040e3b6411 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -122,7 +122,7 @@ jobs:
         shell: bash -l {0}
         run: |
           brew uninstall --cask --zap --force miniconda || true
-          rm -rf /opt/homebrew/Caskroom/miniconda/base || true
+          sed -i '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/.zshrc
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Support the use case where we need to checkout someone's fork

From d00b266ebf62cf4e32341bd78c0ba27d205c133d Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 10:01:38 -0400
Subject: [PATCH 14/32] Update .github/workflows/build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 040e3b6411..004adb85d1 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -122,7 +122,7 @@ jobs:
         shell: bash -l {0}
         run: |
           brew uninstall --cask --zap --force miniconda || true
-          sed -i '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/.zshrc
+          sed -i '' '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/.zshrc
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Support the use case where we need to checkout someone's fork

From 0404edb506506a8d5845a4d7a66600c7dfcef070 Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 10:10:19 -0400
Subject: [PATCH 15/32] Update .github/workflows/build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 004adb85d1..bcacc7802c 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -155,6 +155,9 @@ jobs:
         run: |
           set -euxo pipefail
           conda info
+          conda init
+          conda activate base
+          conda info
           conda env list
           ${CONDA_RUN} python3 -m pip install delocate==0.10.7
       - name: Install torch dependency

From 7d9464f52b4bdca2554b3d42190604b3cec6ec6b Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 10:13:23 -0400
Subject: [PATCH 16/32] Update .github/workflows/build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index bcacc7802c..916374298f 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -123,6 +123,8 @@ jobs:
         run: |
           brew uninstall --cask --zap --force miniconda || true
           sed -i '' '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/.zshrc
+          sed -i '' '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/. bashrc
+          source ~/.bashrc
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Support the use case where we need to checkout someone's fork

From 649d794763f3bdf5ed853c8e3e12cceb2364e79c Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 10:14:25 -0400
Subject: [PATCH 17/32] Update .github/workflows/build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 916374298f..26e200f93b 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -123,7 +123,6 @@ jobs:
         run: |
           brew uninstall --cask --zap --force miniconda || true
           sed -i '' '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/.zshrc
-          sed -i '' '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/. bashrc
           source ~/.bashrc
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:

From ddbb650406bbe91d382f7afee7d5c2171cc5cd6c Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 10:14:43 -0400
Subject: [PATCH 18/32] Update .github/workflows/build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 26e200f93b..9500398d29 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -123,7 +123,7 @@ jobs:
         run: |
           brew uninstall --cask --zap --force miniconda || true
           sed -i '' '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/.zshrc
-          source ~/.bashrc
+          source ~/.zshrc
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Support the use case where we need to checkout someone's fork

From 6a8665a1941535abdfc43ea612313ed0ae0a5d41 Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 10:19:33 -0400
Subject: [PATCH 19/32] Update build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 9500398d29..3d7b99ce1d 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -123,7 +123,15 @@ jobs:
         run: |
           brew uninstall --cask --zap --force miniconda || true
           sed -i '' '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/.zshrc
-          source ~/.zshrc
+          sed -i '' '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/.bash_profile
+          source ~/.bash_profile
+      - name: Test conda removal
+        shell: bash -l {0}
+        run: |
+          set -euxo pipefail
+          conda info
+          source ~/.bash_profile
+          conda info
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Support the use case where we need to checkout someone's fork
@@ -156,10 +164,6 @@ jobs:
         run: |
           set -euxo pipefail
           conda info
-          conda init
-          conda activate base
-          conda info
-          conda env list
           ${CONDA_RUN} python3 -m pip install delocate==0.10.7
       - name: Install torch dependency
         run: |

From a9881c683e2db745451f86412356eadca43de09c Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 10:21:36 -0400
Subject: [PATCH 20/32] Update .github/workflows/build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 3d7b99ce1d..0dd65016c2 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -126,6 +126,7 @@ jobs:
           sed -i '' '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/.bash_profile
           source ~/.bash_profile
       - name: Test conda removal
+	continue-on-error: true
         shell: bash -l {0}
         run: |
           set -euxo pipefail

From 4c2a138137e15c02ccadd11c834dd12a7aa5da51 Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 10:24:38 -0400
Subject: [PATCH 21/32] Update build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 0dd65016c2..7b733b8f4c 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -123,16 +123,13 @@ jobs:
         run: |
           brew uninstall --cask --zap --force miniconda || true
           sed -i '' '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/.zshrc
-          sed -i '' '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/.bash_profile
-          source ~/.bash_profile
+          source ~/.zshrc
       - name: Test conda removal
-	continue-on-error: true
+        continue-on-error: true
         shell: bash -l {0}
         run: |
           set -euxo pipefail
           conda info
-          source ~/.bash_profile
-          conda info
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Support the use case where we need to checkout someone's fork
@@ -162,6 +159,7 @@ jobs:
           cat "${{ inputs.env-var-script }}" >> "${BUILD_ENV_FILE}"
       - name: Install delocate-wheel
         if: ${{ inputs.delocate-wheel }}
+	shell: bash -l {0}
         run: |
           set -euxo pipefail
           conda info

From 116abedec195d807c16473695b1d7788a14cd07e Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 10:26:19 -0400
Subject: [PATCH 22/32] Update build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 7b733b8f4c..6ea92cffff 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -159,7 +159,7 @@ jobs:
           cat "${{ inputs.env-var-script }}" >> "${BUILD_ENV_FILE}"
       - name: Install delocate-wheel
         if: ${{ inputs.delocate-wheel }}
-	shell: bash -l {0}
+        shell: bash -l {0}
         run: |
           set -euxo pipefail
           conda info

From 66c5524e12a1bc6287edbddc6ae4995f68c178a0 Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 10:30:58 -0400
Subject: [PATCH 23/32] Update build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 6ea92cffff..bb96663f39 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -165,6 +165,7 @@ jobs:
           conda info
           ${CONDA_RUN} python3 -m pip install delocate==0.10.7
       - name: Install torch dependency
+        shell: bash -l {0}
         run: |
           set -euxo pipefail
           # shellcheck disable=SC1090
@@ -208,6 +209,7 @@ jobs:
       - name: Build the wheel (setup-py)
         if: ${{ inputs.build-platform == 'setup-py' }}
         working-directory: ${{ inputs.repository }}
+        shell: bash -l {0}
         run: |
           set -euxo pipefail
           # shellcheck disable=SC1090
@@ -223,6 +225,7 @@ jobs:
       - name: Delocate wheel
         if: ${{ inputs.delocate-wheel }}
         working-directory: ${{ inputs.repository }}
+        shell: bash -l {0}
         run: |
           set -euxo pipefail
           ${CONDA_RUN} DYLD_FALLBACK_LIBRARY_PATH="${CONDA_ENV}/lib" delocate-wheel -v --ignore-missing-dependencies dist/*.whl

From 5228939bf93ef6565d377217daadedbf78d0e603 Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 10:39:11 -0400
Subject: [PATCH 24/32] Update build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index bb96663f39..c852bc24ba 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -182,6 +182,7 @@ jobs:
           script: ${{ inputs.pre-script }}
       - name: Build clean
         working-directory: ${{ inputs.repository }}
+        shell: bash -l {0}
         run: |
           set -euxo pipefail
           # shellcheck disable=SC1090

From 85e33ba41e3681a19157c801ba2a08071a04204a Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 11:04:42 -0400
Subject: [PATCH 25/32] Update build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index c852bc24ba..80afffa0d1 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -171,7 +171,7 @@ jobs:
           # shellcheck disable=SC1090
           source "${BUILD_ENV_FILE}"
           # shellcheck disable=SC2086
-          ${CONDA_RUN} ${PIP_INSTALL_TORCH}
+          ${CONDA_RUN} ${PIP_INSTALL_TORCH} 
       - name: Run Pre-Script with Caching
         if: ${{ inputs.pre-script != '' }}
         uses: ./test-infra/.github/actions/run-script-with-cache
@@ -187,6 +187,8 @@ jobs:
           set -euxo pipefail
           # shellcheck disable=SC1090
           source "${BUILD_ENV_FILE}"
+          ${CONDA_RUN} which python3
+          ${CONDA_RUN} conda list
           ${CONDA_RUN} python3 setup.py clean
       - name: Build the wheel (python-build-package)
         if: ${{ inputs.build-platform == 'python-build-package' }}

From 77c145b1cf1987b2adc78157527c5039d3ca91a8 Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Mon, 7 Jul 2025 11:22:57 -0400
Subject: [PATCH 26/32] Update .github/workflows/build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 80afffa0d1..b692d642df 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -189,7 +189,7 @@ jobs:
           source "${BUILD_ENV_FILE}"
           ${CONDA_RUN} which python3
           ${CONDA_RUN} conda list
-          ${CONDA_RUN} python3 setup.py clean
+          ${CONDA_RUN} python setup.py clean
       - name: Build the wheel (python-build-package)
         if: ${{ inputs.build-platform == 'python-build-package' }}
         working-directory: ${{ inputs.repository }}

From 314ef3e94ecaa56a32471a4939b820807b1f74c7 Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Tue, 8 Jul 2025 08:28:59 -0400
Subject: [PATCH 27/32] Update build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index b692d642df..41a54442a5 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -223,7 +223,7 @@ jobs:
           fi
           PYTORCH_VERSION="$(${CONDA_RUN} pip show torch | grep ^Version: | sed 's/Version:  *//')"
           export PYTORCH_VERSION
-
+          ${CONDA_RUN} python3 -c "import torch"  
           ${CONDA_RUN} python3 setup.py bdist_wheel
       - name: Delocate wheel
         if: ${{ inputs.delocate-wheel }}

From 818ce0691ab5aed19388cf4cba2c68e6f79bb4e2 Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Tue, 8 Jul 2025 08:38:29 -0400
Subject: [PATCH 28/32] Update test_build_wheels_m1.yml

---
 .github/workflows/test_build_wheels_m1.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/test_build_wheels_m1.yml b/.github/workflows/test_build_wheels_m1.yml
index 9bc3cc8f83..05bb14fb74 100644
--- a/.github/workflows/test_build_wheels_m1.yml
+++ b/.github/workflows/test_build_wheels_m1.yml
@@ -28,10 +28,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - repository: pytorch/audio
-            conda-package-directory: packaging/torchaudio
-            smoke-test-script: test/smoke_test/smoke_test.py
-            package-name: torchaudio
           - repository: pytorch/vision
             pre-script: packaging/pre_build_script.sh
             post-script: packaging/post_build_script.sh

From af46f8bbfe44c15bbbc1682bf1c7b7cc9435c96c Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Tue, 8 Jul 2025 08:43:47 -0400
Subject: [PATCH 29/32] Update build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 41a54442a5..135c81b5d6 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -223,6 +223,8 @@ jobs:
           fi
           PYTORCH_VERSION="$(${CONDA_RUN} pip show torch | grep ^Version: | sed 's/Version:  *//')"
           export PYTORCH_VERSION
+          sleep 90m
+          
           ${CONDA_RUN} python3 -c "import torch"  
           ${CONDA_RUN} python3 setup.py bdist_wheel
       - name: Delocate wheel

From 87b2577fd5844820cba0b162ee8f06d2a178ecdb Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Tue, 8 Jul 2025 08:48:58 -0400
Subject: [PATCH 30/32] Update .github/workflows/build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 135c81b5d6..ac6538da77 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -223,7 +223,7 @@ jobs:
           fi
           PYTORCH_VERSION="$(${CONDA_RUN} pip show torch | grep ^Version: | sed 's/Version:  *//')"
           export PYTORCH_VERSION
-          sleep 90m
+          sleep 3600
           
           ${CONDA_RUN} python3 -c "import torch"  
           ${CONDA_RUN} python3 setup.py bdist_wheel

From d7a85dd2d49cd4d90dc6321c90926a82bdd873ce Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Tue, 8 Jul 2025 10:17:00 -0400
Subject: [PATCH 31/32] Update build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index ac6538da77..25b95c36d0 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -163,6 +163,9 @@ jobs:
         run: |
           set -euxo pipefail
           conda info
+          conda deactivate
+          conda activate test
+          conda info
           ${CONDA_RUN} python3 -m pip install delocate==0.10.7
       - name: Install torch dependency
         shell: bash -l {0}

From fd5a6d7607e82b7a8a2be50cc53e700adfcccbd2 Mon Sep 17 00:00:00 2001
From: Andrey Talman <atalman@fb.com>
Date: Tue, 8 Jul 2025 11:04:27 -0400
Subject: [PATCH 32/32] Update build_wheels_macos.yml

---
 .github/workflows/build_wheels_macos.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 25b95c36d0..8be250e7f0 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -117,19 +117,6 @@ jobs:
           rm -rfv "${GITHUB_WORKSPACE}"
           mkdir -p "${GITHUB_WORKSPACE}"
           echo "::endgroup::"
-      - name: Clean up leftover miniconda installation
-        continue-on-error: true
-        shell: bash -l {0}
-        run: |
-          brew uninstall --cask --zap --force miniconda || true
-          sed -i '' '/# >>> conda initialize >>>/,/# <<< conda initialize <<</d' ~/.zshrc
-          source ~/.zshrc
-      - name: Test conda removal
-        continue-on-error: true
-        shell: bash -l {0}
-        run: |
-          set -euxo pipefail
-          conda info
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Support the use case where we need to checkout someone's fork
@@ -226,7 +213,6 @@ jobs:
           fi
           PYTORCH_VERSION="$(${CONDA_RUN} pip show torch | grep ^Version: | sed 's/Version:  *//')"
           export PYTORCH_VERSION
-          sleep 3600
           
           ${CONDA_RUN} python3 -c "import torch"  
           ${CONDA_RUN} python3 setup.py bdist_wheel