From 35ff7055df055c5f0bb56ba3301619768a910138 Mon Sep 17 00:00:00 2001 From: Andrey Talman Date: Tue, 14 Jun 2022 21:20:32 -0700 Subject: [PATCH 1/4] Making sure we are picking correct release branch (#2489) Summary: Making sure we are picking correct release branch Ref: https://github.com/pytorch/vision/pull/6168 Pull Request resolved: https://github.com/pytorch/audio/pull/2489 Reviewed By: mthrok Differential Revision: D37160145 Pulled By: atalman fbshipit-source-id: 3e4a2208cbe47f85147573159f9adb8d6a824956 --- .github/workflows/build-m1-binaries.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build-m1-binaries.yml b/.github/workflows/build-m1-binaries.yml index 4e192c7e1c..83ce17ccf4 100644 --- a/.github/workflows/build-m1-binaries.yml +++ b/.github/workflows/build-m1-binaries.yml @@ -6,6 +6,7 @@ on: push: branches: - nightly + - release/* tags: # NOTE: Binary build pipelines should only get triggered on release candidate builds # Release candidate tags look like: v1.11.0-rc1 @@ -30,6 +31,10 @@ jobs: if [[ ${GITHUB_REF_NAME} = *-rc[0-9]* ]]; then echo "CHANNEL=test" >> "$GITHUB_ENV" fi + - name: Set Release CHANNEL (for release) + if: ${{ (github.event_name == 'pull_request' && startsWith(github.base_ref, 'release')) || startsWith(github.ref, 'release') }} + run: | + echo "CHANNEL=test" >> "$GITHUB_ENV" - name: Build TorchAudio M1 wheel shell: arch -arch arm64 bash {0} env: @@ -108,6 +113,10 @@ jobs: if [[ ${GITHUB_REF_NAME} = *-rc[0-9]* ]]; then echo "CHANNEL=test" >> "$GITHUB_ENV" fi + - name: Set Release CHANNEL (for release) + if: ${{ (github.event_name == 'pull_request' && startsWith(github.base_ref, 'release')) || startsWith(github.ref, 'release') }} + run: | + echo "CHANNEL=test" >> "$GITHUB_ENV" - name: Install conda-build and purge previous artifacts shell: arch -arch arm64 bash {0} run: | From d4369796114b0fbd200253c40fe71370feb6e36d Mon Sep 17 00:00:00 2001 From: Andrey Talman Date: Wed, 15 Jun 2022 08:28:56 -0700 Subject: [PATCH 2/4] Fix push on release reference name (#2492) Summary: Fix push on release reference name We want to compare it against refs/heads/release rather then release Tests: https://github.com/atalman/vision/commit/af17cd95d2d43ca13354fb700e2da42108dd5a87 Sets correctly release chanell (wheels): https://github.com/atalman/vision/runs/6901327010?check_suite_focus=true Pull Request resolved: https://github.com/pytorch/audio/pull/2492 Reviewed By: hwangjeff Differential Revision: D37174090 Pulled By: atalman fbshipit-source-id: e114972935572a701eb7daff429a0df0ed5a75e4 --- .github/workflows/build-m1-binaries.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-m1-binaries.yml b/.github/workflows/build-m1-binaries.yml index 83ce17ccf4..4ad90e2249 100644 --- a/.github/workflows/build-m1-binaries.yml +++ b/.github/workflows/build-m1-binaries.yml @@ -32,7 +32,7 @@ jobs: echo "CHANNEL=test" >> "$GITHUB_ENV" fi - name: Set Release CHANNEL (for release) - if: ${{ (github.event_name == 'pull_request' && startsWith(github.base_ref, 'release')) || startsWith(github.ref, 'release') }} + if: ${{ (github.event_name == 'pull_request' && startsWith(github.base_ref, 'release')) || startsWith(github.ref, 'refs/heads/release') }} run: | echo "CHANNEL=test" >> "$GITHUB_ENV" - name: Build TorchAudio M1 wheel @@ -114,7 +114,7 @@ jobs: echo "CHANNEL=test" >> "$GITHUB_ENV" fi - name: Set Release CHANNEL (for release) - if: ${{ (github.event_name == 'pull_request' && startsWith(github.base_ref, 'release')) || startsWith(github.ref, 'release') }} + if: ${{ (github.event_name == 'pull_request' && startsWith(github.base_ref, 'release')) || startsWith(github.ref, 'refs/heads/release') }} run: | echo "CHANNEL=test" >> "$GITHUB_ENV" - name: Install conda-build and purge previous artifacts From 48a45ea19eac37f5f68ca4fb0774cef376414479 Mon Sep 17 00:00:00 2001 From: Andrey Talman Date: Wed, 15 Jun 2022 10:21:38 -0700 Subject: [PATCH 3/4] Fix typo in release build step (#2495) Summary: Fix typo in release build step Pull Request resolved: https://github.com/pytorch/audio/pull/2495 Reviewed By: hwangjeff Differential Revision: D37176695 Pulled By: atalman fbshipit-source-id: 37b4e30c1084e506f3a45cf7427784c955868909 --- .github/workflows/build-m1-binaries.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-m1-binaries.yml b/.github/workflows/build-m1-binaries.yml index 4ad90e2249..ed1684aaf1 100644 --- a/.github/workflows/build-m1-binaries.yml +++ b/.github/workflows/build-m1-binaries.yml @@ -142,7 +142,7 @@ jobs: setup_cuda setup_base_build_version export CONDA_CHANNEL_FLAGS="pytorch-test" - etup_macos + setup_macos else setup_cuda setup_build_version From f6929446cb3e6401165d9bc43f0802b84a5ce1fb Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 15 Jun 2022 10:57:34 -0700 Subject: [PATCH 4/4] Making sure channel flag is set correctly --- .github/workflows/build-m1-binaries.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-m1-binaries.yml b/.github/workflows/build-m1-binaries.yml index ed1684aaf1..8055b5f3be 100644 --- a/.github/workflows/build-m1-binaries.yml +++ b/.github/workflows/build-m1-binaries.yml @@ -141,7 +141,7 @@ jobs: if [[ $CHANNEL == "test" ]]; then setup_cuda setup_base_build_version - export CONDA_CHANNEL_FLAGS="pytorch-test" + export CONDA_CHANNEL_FLAGS="-c pytorch-test" setup_macos else setup_cuda