From fac06edfbb213957cca00859d0a268da1ce459d5 Mon Sep 17 00:00:00 2001 From: Huy Do Date: Tue, 16 Jan 2024 22:32:51 -0800 Subject: [PATCH] Fix anaconda path in conda environment on GH ephemeral runner (#4891) I tested https://github.com/pytorch/test-infra/pull/4886 with vision nightly and found out that I need to set the path to anaconda on GH ephemeral runner used by the upload job. It would fail otherwise, i.e. https://github.com/pytorch/vision/actions/runs/7550404642/job/20556529100#step:7:121 ### Testing https://github.com/pytorch/test-infra/actions/runs/7550720719/job/20557072841?pr=4891#step:7:117 shows that conda can find anaconda client version correctly. --- .github/workflows/_binary_conda_upload.yml | 3 ++- .github/workflows/test_build_conda_linux_with_cuda.yml | 1 + .github/workflows/test_build_conda_linux_without_cuda.yml | 1 + .github/workflows/test_build_conda_m1.yml | 1 + .github/workflows/test_build_conda_macos.yml | 1 + .github/workflows/test_build_conda_windows_with_cuda.yml | 1 + .github/workflows/test_build_conda_windows_without_cuda.yml | 1 + 7 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/_binary_conda_upload.yml b/.github/workflows/_binary_conda_upload.yml index 2dbfc419f4..88656cbd4d 100644 --- a/.github/workflows/_binary_conda_upload.yml +++ b/.github/workflows/_binary_conda_upload.yml @@ -92,10 +92,11 @@ jobs: # shellcheck disable=SC1090 source "${BUILD_ENV_FILE}" conda install --yes --quiet anaconda-client + conda run --no-capture-output anaconda --version if [[ "${NIGHTLY_OR_TEST:-0}" == "1" ]]; then for pkg in distr/**/*.tar.bz2; do - anaconda \ + conda run --no-capture-output anaconda \ -t "${CONDA_TOKEN}" \ upload "${pkg}" \ -u "pytorch-${CHANNEL}" \ diff --git a/.github/workflows/test_build_conda_linux_with_cuda.yml b/.github/workflows/test_build_conda_linux_with_cuda.yml index e14c81cffd..3163daae1b 100644 --- a/.github/workflows/test_build_conda_linux_with_cuda.yml +++ b/.github/workflows/test_build_conda_linux_with_cuda.yml @@ -7,6 +7,7 @@ on: - .github/workflows/test_build_conda_linux.yml - .github/workflows/build_conda_linux.yml - .github/workflows/generate_binary_build_matrix.yml + - .github/workflows/_binary_conda_upload.yml - tools/scripts/generate_binary_build_matrix.py workflow_dispatch: diff --git a/.github/workflows/test_build_conda_linux_without_cuda.yml b/.github/workflows/test_build_conda_linux_without_cuda.yml index 9331bd8f06..b9d1da6c79 100644 --- a/.github/workflows/test_build_conda_linux_without_cuda.yml +++ b/.github/workflows/test_build_conda_linux_without_cuda.yml @@ -7,6 +7,7 @@ on: - .github/workflows/test_build_conda_linux.yml - .github/workflows/build_conda_linux.yml - .github/workflows/generate_binary_build_matrix.yml + - .github/workflows/_binary_conda_upload.yml - tools/scripts/generate_binary_build_matrix.py workflow_dispatch: diff --git a/.github/workflows/test_build_conda_m1.yml b/.github/workflows/test_build_conda_m1.yml index cdbc036847..1a24cb0fda 100644 --- a/.github/workflows/test_build_conda_m1.yml +++ b/.github/workflows/test_build_conda_m1.yml @@ -7,6 +7,7 @@ on: - .github/workflows/test_build_conda_m1.yml - .github/workflows/build_conda_macos.yml - .github/workflows/generate_binary_build_matrix.yml + - .github/workflows/_binary_conda_upload.yml - tools/scripts/generate_binary_build_matrix.py workflow_dispatch: diff --git a/.github/workflows/test_build_conda_macos.yml b/.github/workflows/test_build_conda_macos.yml index d63802e22c..8e6ce42662 100644 --- a/.github/workflows/test_build_conda_macos.yml +++ b/.github/workflows/test_build_conda_macos.yml @@ -7,6 +7,7 @@ on: - .github/workflows/test_build_conda_macos.yml - .github/workflows/build_conda_macos.yml - .github/workflows/generate_binary_build_matrix.yml + - .github/workflows/_binary_conda_upload.yml - tools/scripts/generate_binary_build_matrix.py jobs: diff --git a/.github/workflows/test_build_conda_windows_with_cuda.yml b/.github/workflows/test_build_conda_windows_with_cuda.yml index 8c68c06858..4ab1367637 100644 --- a/.github/workflows/test_build_conda_windows_with_cuda.yml +++ b/.github/workflows/test_build_conda_windows_with_cuda.yml @@ -7,6 +7,7 @@ on: - .github/workflows/test_build_conda_windows_with_cuda.yml - .github/workflows/build_conda_windows.yml - .github/workflows/generate_binary_build_matrix.yml + - .github/workflows/_binary_conda_upload.yml - tools/scripts/generate_binary_build_matrix.py workflow_dispatch: diff --git a/.github/workflows/test_build_conda_windows_without_cuda.yml b/.github/workflows/test_build_conda_windows_without_cuda.yml index 4d5583d1e0..282ffcd742 100644 --- a/.github/workflows/test_build_conda_windows_without_cuda.yml +++ b/.github/workflows/test_build_conda_windows_without_cuda.yml @@ -7,6 +7,7 @@ on: - .github/workflows/test_build_conda_windows_without_cuda.yml - .github/workflows/build_conda_windows.yml - .github/workflows/generate_binary_build_matrix.yml + - .github/workflows/_binary_conda_upload.yml - tools/scripts/generate_binary_build_matrix.py workflow_dispatch: