From b066c8d44963a4e2d795565b77abe0db6c99b384 Mon Sep 17 00:00:00 2001 From: Huy Do Date: Fri, 8 Dec 2023 12:01:52 -0800 Subject: [PATCH 1/3] cherrypick '[RELEASE-ONLY CHANGES] Specific conda token for test channel' --- .github/workflows/build-conda-m1.yml | 1 + ...uild-conda-linux.yml => build-conda-macos.yml} | 15 ++++++++------- .github/workflows/build-conda-windows.yml | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) rename .github/workflows/{build-conda-linux.yml => build-conda-macos.yml} (82%) diff --git a/.github/workflows/build-conda-m1.yml b/.github/workflows/build-conda-m1.yml index b59b27c7fa..3bc278ef02 100644 --- a/.github/workflows/build-conda-m1.yml +++ b/.github/workflows/build-conda-m1.yml @@ -52,3 +52,4 @@ jobs: trigger-event: ${{ github.event_name }} secrets: CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} + CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }} diff --git a/.github/workflows/build-conda-linux.yml b/.github/workflows/build-conda-macos.yml similarity index 82% rename from .github/workflows/build-conda-linux.yml rename to .github/workflows/build-conda-macos.yml index 87dc12a010..627f28ed04 100644 --- a/.github/workflows/build-conda-linux.yml +++ b/.github/workflows/build-conda-macos.yml @@ -1,4 +1,4 @@ -name: Build Linux Conda +name: Build Macos Conda on: pull_request: @@ -15,13 +15,12 @@ on: jobs: generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.2 with: package-type: conda - os: linux + os: macos test-infra-repository: pytorch/test-infra - test-infra-ref: main - with-cuda: disable + test-infra-ref: release/2.2 build: needs: generate-matrix strategy: @@ -35,20 +34,22 @@ jobs: smoke-test-script: test/smoke_tests/smoke_tests.py package-name: torchtext name: ${{ matrix.repository }} - uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@main + uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@release/2.2 with: conda-package-directory: ${{ matrix.conda-package-directory }} repository: ${{ matrix.repository }} ref: "" test-infra-repository: pytorch/test-infra - test-infra-ref: main + test-infra-ref: release/2.2 build-matrix: ${{ needs.generate-matrix.outputs.matrix }} pre-script: ${{ matrix.pre-script }} post-script: ${{ matrix.post-script }} package-name: ${{ matrix.package-name }} smoke-test-script: ${{ matrix.smoke-test-script }} + runner-type: macos-12 # Using "development" as trigger event so these binaries are not uploaded # to official channels yet trigger-event: ${{ github.event_name }} secrets: CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} + CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }} diff --git a/.github/workflows/build-conda-windows.yml b/.github/workflows/build-conda-windows.yml index db1037574a..ba937d3499 100644 --- a/.github/workflows/build-conda-windows.yml +++ b/.github/workflows/build-conda-windows.yml @@ -50,3 +50,4 @@ jobs: trigger-event: ${{ github.event_name }} secrets: CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} + CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }} From e0be089cef5991c930e687143791df3491f15339 Mon Sep 17 00:00:00 2001 From: Huy Do Date: Fri, 8 Dec 2023 12:01:52 -0800 Subject: [PATCH 2/3] cherrypick '[RELEASE-ONLY CHANGES] Specific conda token for test channel' --- .github/workflows/build-conda-macos.yml | 55 ------------------------- 1 file changed, 55 deletions(-) delete mode 100644 .github/workflows/build-conda-macos.yml diff --git a/.github/workflows/build-conda-macos.yml b/.github/workflows/build-conda-macos.yml deleted file mode 100644 index 627f28ed04..0000000000 --- a/.github/workflows/build-conda-macos.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Build Macos Conda - -on: - pull_request: - push: - branches: - - nightly - - main - - release/* - tags: - # NOTE: Binary build pipelines should only get triggered on release candidate builds - # Release candidate tags look like: v1.11.0-rc1 - - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+ - workflow_dispatch: - -jobs: - generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.2 - with: - package-type: conda - os: macos - test-infra-repository: pytorch/test-infra - test-infra-ref: release/2.2 - build: - needs: generate-matrix - strategy: - fail-fast: false - matrix: - include: - - repository: pytorch/text - pre-script: packaging/install_torchdata.sh - post-script: "" - conda-package-directory: packaging/torchtext - smoke-test-script: test/smoke_tests/smoke_tests.py - package-name: torchtext - name: ${{ matrix.repository }} - uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@release/2.2 - with: - conda-package-directory: ${{ matrix.conda-package-directory }} - repository: ${{ matrix.repository }} - ref: "" - test-infra-repository: pytorch/test-infra - test-infra-ref: release/2.2 - build-matrix: ${{ needs.generate-matrix.outputs.matrix }} - pre-script: ${{ matrix.pre-script }} - post-script: ${{ matrix.post-script }} - package-name: ${{ matrix.package-name }} - smoke-test-script: ${{ matrix.smoke-test-script }} - runner-type: macos-12 - # Using "development" as trigger event so these binaries are not uploaded - # to official channels yet - trigger-event: ${{ github.event_name }} - secrets: - CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} - CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }} From fe0c8b15efe0fdcc9fc735fcabe73dd0759ddf1e Mon Sep 17 00:00:00 2001 From: PaliC Date: Fri, 15 Mar 2024 13:14:15 -0700 Subject: [PATCH 3/3] readd accidentally removed linux build --- .github/workflows/build-conda-linux.yml | 55 +++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 .github/workflows/build-conda-linux.yml diff --git a/.github/workflows/build-conda-linux.yml b/.github/workflows/build-conda-linux.yml new file mode 100644 index 0000000000..c9a7b72f0a --- /dev/null +++ b/.github/workflows/build-conda-linux.yml @@ -0,0 +1,55 @@ +name: Build Linux Conda + +on: + pull_request: + push: + branches: + - nightly + - main + - release/* + tags: + # NOTE: Binary build pipelines should only get triggered on release candidate builds + # Release candidate tags look like: v1.11.0-rc1 + - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+ + workflow_dispatch: + +jobs: + generate-matrix: + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main + with: + package-type: conda + os: linux + test-infra-repository: pytorch/test-infra + test-infra-ref: main + with-cuda: disable + build: + needs: generate-matrix + strategy: + fail-fast: false + matrix: + include: + - repository: pytorch/text + pre-script: packaging/install_torchdata.sh + post-script: "" + conda-package-directory: packaging/torchtext + smoke-test-script: test/smoke_tests/smoke_tests.py + package-name: torchtext + name: ${{ matrix.repository }} + uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@main + with: + conda-package-directory: ${{ matrix.conda-package-directory }} + repository: ${{ matrix.repository }} + ref: "" + test-infra-repository: pytorch/test-infra + test-infra-ref: main + build-matrix: ${{ needs.generate-matrix.outputs.matrix }} + pre-script: ${{ matrix.pre-script }} + post-script: ${{ matrix.post-script }} + package-name: ${{ matrix.package-name }} + smoke-test-script: ${{ matrix.smoke-test-script }} + # Using "development" as trigger event so these binaries are not uploaded + # to official channels yet + trigger-event: ${{ github.event_name }} + secrets: + CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} + CONDA_PYTORCHBOT_TOKEN_TEST: ${{ secrets.CONDA_PYTORCHBOT_TOKEN_TEST }} \ No newline at end of file