From 4f8e54656decf391937279e39b0db3a289ab8962 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 14 Jun 2022 16:31:02 -0700 Subject: [PATCH 1/2] Make sure we are picking up correct channel when building against release version --- .github/workflows/build-m1-binaries.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build-m1-binaries.yml b/.github/workflows/build-m1-binaries.yml index 4e192c7e1c..9a14d76f2e 100644 --- a/.github/workflows/build-m1-binaries.yml +++ b/.github/workflows/build-m1-binaries.yml @@ -30,6 +30,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') }} + run: | + echo "CHANNEL=test" >> "$GITHUB_ENV" - name: Build TorchAudio M1 wheel shell: arch -arch arm64 bash {0} env: @@ -108,6 +112,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') }} + run: | + echo "CHANNEL=test" >> "$GITHUB_ENV" - name: Install conda-build and purge previous artifacts shell: arch -arch arm64 bash {0} run: | From c8d582f4d0414fe63a16833477444b0481bfe245 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 14 Jun 2022 16:50:53 -0700 Subject: [PATCH 2/2] Adding release fixes --- .github/workflows/build-m1-binaries.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-m1-binaries.yml b/.github/workflows/build-m1-binaries.yml index 9a14d76f2e..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 @@ -31,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') }} + 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 @@ -113,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') }} + 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