From 5351c1fc5d9f402ce2eebe1f79aee67fe1d787cf Mon Sep 17 00:00:00 2001 From: Andrey Talman Date: Fri, 24 Nov 2023 14:56:04 +0000 Subject: [PATCH] Restrict conda pin to 23.7.3 to macos only (#4754) (#4755) Follow up on https://github.com/pytorch/test-infra/pull/4752 Restrict to MacOS only. Pinning to 23.7.3 for everything causes failure in aarch64 builds here: https://github.com/pytorch/audio/actions/runs/6980246736/job/18995112761 --- .github/actions/setup-binary-builds/action.yml | 4 ---- .github/workflows/build_conda_macos.yml | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/setup-binary-builds/action.yml b/.github/actions/setup-binary-builds/action.yml index 2dfcfc7c87..0b4c415165 100644 --- a/.github/actions/setup-binary-builds/action.yml +++ b/.github/actions/setup-binary-builds/action.yml @@ -109,10 +109,6 @@ runs: set -euxo pipefail CONDA_ENV="${RUNNER_TEMP}/conda_environment_${GITHUB_RUN_ID}" - # Both conda-build and conda need to be advanced togeather. - # This will make system conda use required value. - conda install --yes conda=23.7.3 - if [[ "${PYTHON_VERSION}" = "3.11" ]]; then if [[ "${PACKAGE_TYPE:-}" == "conda" ]]; then diff --git a/.github/workflows/build_conda_macos.yml b/.github/workflows/build_conda_macos.yml index fd5ee452f9..92be90f837 100644 --- a/.github/workflows/build_conda_macos.yml +++ b/.github/workflows/build_conda_macos.yml @@ -140,6 +140,10 @@ 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}" \