Move conda and conda-builds to latest conda versions (#4759)

Two cherry picks to Move conda and conda builds to latest conda versions.
pytorch · Nov 24, 2023 · 960acd4 · 960acd4
1 parent 5351c1f
commit 960acd4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 39 deletions.
diff --git a/.github/actions/setup-binary-builds/action.yml b/.github/actions/setup-binary-builds/action.yml
@@ -109,41 +109,16 @@ runs:
           set -euxo pipefail
           CONDA_ENV="${RUNNER_TEMP}/conda_environment_${GITHUB_RUN_ID}"
 
-          if [[ "${PYTHON_VERSION}" = "3.11" ]]; then
+          conda create \
+            --yes --quiet \
+            --prefix "${CONDA_ENV}" \
+            "python=${PYTHON_VERSION}" \
+            cmake=3.22 \
+            conda-build=3.27.0 \
+            conda=23.10.0 \
+            ninja=1.10 \
+            pkg-config=0.29 \
+            wheel=0.37
 
-            if [[ "${PACKAGE_TYPE:-}" == "conda" ]]; then
-              conda create \
-                --yes --quiet \
-                --prefix "${CONDA_ENV}" \
-                "python=3.8" \
-                cmake=3.22 \
-                conda-build=3.21 \
-                conda=23.7.3 \
-                ninja=1.10 \
-                pkg-config=0.29 \
-                wheel=0.37
-            else
-              conda create \
-                --yes --quiet \
-                --prefix "${CONDA_ENV}" \
-                "python=${PYTHON_VERSION}" \
-                conda=23.7.3 \
-                cmake=3.22 \
-                ninja=1.10 \
-                pkg-config=0.29 \
-                wheel=0.37
-            fi
-          else
-            conda create \
-              --yes --quiet \
-              --prefix "${CONDA_ENV}" \
-              "python=${PYTHON_VERSION}" \
-              cmake=3.22 \
-              conda-build=3.21 \
-              conda=23.7.3 \
-              ninja=1.10 \
-              pkg-config=0.29 \
-              wheel=0.37
-          fi
           echo "CONDA_ENV=${CONDA_ENV}" >> "${GITHUB_ENV}"
           echo "CONDA_RUN=conda run -p ${CONDA_ENV}" >> "${GITHUB_ENV}"
diff --git a/.github/workflows/build_conda_macos.yml b/.github/workflows/build_conda_macos.yml
@@ -140,10 +140,6 @@ jobs:
             export USE_OPENMP="0"
           fi
 
-          # conda 23.10 is installed by default on macos M1
-          # and this creates an issue. Hence downgrading it here
-          conda install --yes conda=23.7.3
-
           ${CONDA_RUN} conda build \
             -c defaults \
             -c "pytorch-${CHANNEL}" \