diff --git a/.circleci/config.yml b/.circleci/config.yml index 1bb9d36b54..7704b1cd6f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -619,30 +619,6 @@ workflows: only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ name: binary_linux_wheel_py3.8 python_version: '3.8' - - binary_windows_wheel: - name: binary_windows_wheel_py3.8 - python_version: '3.8' - - binary_windows_wheel: - name: binary_windows_wheel_py3.9 - python_version: '3.9' - - binary_windows_wheel: - name: binary_windows_wheel_py3.10 - python_version: '3.10' - - binary_windows_wheel: - name: binary_windows_wheel_py3.11 - python_version: '3.11' - - binary_windows_conda: - name: binary_windows_conda_py3.8 - python_version: '3.8' - - binary_windows_conda: - name: binary_windows_conda_py3.9 - python_version: '3.9' - - binary_windows_conda: - name: binary_windows_conda_py3.10 - python_version: '3.10' - - binary_windows_conda: - name: binary_windows_conda_py3.11 - python_version: '3.11' - build_docs: filters: branches: @@ -689,230 +665,6 @@ workflows: only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ name: nightly_binary_linux_wheel_py3.8 python_version: '3.8' - - binary_windows_wheel: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.8 - python_version: '3.8' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.8_upload - requires: - - nightly_binary_windows_wheel_py3.8 - - smoke_test_windows_pip: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.8_smoke_test_pip - python_version: '3.8' - requires: - - nightly_binary_windows_wheel_py3.8_upload - - binary_windows_wheel: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.9 - python_version: '3.9' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.9_upload - requires: - - nightly_binary_windows_wheel_py3.9 - - smoke_test_windows_pip: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.9_smoke_test_pip - python_version: '3.9' - requires: - - nightly_binary_windows_wheel_py3.9_upload - - binary_windows_wheel: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.10 - python_version: '3.10' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.10_upload - requires: - - nightly_binary_windows_wheel_py3.10 - - smoke_test_windows_pip: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.10_smoke_test_pip - python_version: '3.10' - requires: - - nightly_binary_windows_wheel_py3.10_upload - - binary_windows_wheel: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.11 - python_version: '3.11' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.11_upload - requires: - - nightly_binary_windows_wheel_py3.11 - - smoke_test_windows_pip: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_wheel_py3.11_smoke_test_pip - python_version: '3.11' - requires: - - nightly_binary_windows_wheel_py3.11_upload - - binary_windows_conda: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.8 - python_version: '3.8' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.8_upload - requires: - - nightly_binary_windows_conda_py3.8 - - smoke_test_windows_conda: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.8_smoke_test_conda - python_version: '3.8' - requires: - - nightly_binary_windows_conda_py3.8_upload - - binary_windows_conda: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.9 - python_version: '3.9' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.9_upload - requires: - - nightly_binary_windows_conda_py3.9 - - smoke_test_windows_conda: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.9_smoke_test_conda - python_version: '3.9' - requires: - - nightly_binary_windows_conda_py3.9_upload - - binary_windows_conda: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.10 - python_version: '3.10' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.10_upload - requires: - - nightly_binary_windows_conda_py3.10 - - smoke_test_windows_conda: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.10_smoke_test_conda - python_version: '3.10' - requires: - - nightly_binary_windows_conda_py3.10_upload - - binary_windows_conda: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.11 - python_version: '3.11' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.11_upload - requires: - - nightly_binary_windows_conda_py3.11 - - smoke_test_windows_conda: - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_windows_conda_py3.11_smoke_test_conda - python_version: '3.11' - requires: - - nightly_binary_windows_conda_py3.11_upload docker_build: triggers: - schedule: diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index 4c8b3437b4..1dd68e152e 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -42,7 +42,7 @@ def build_workflows(prefix="", upload=False, filter_branch=None, indentation=6): continue if os_type == "linux" and btype == "conda": continue - if os_type == "macos": + if os_type == "macos" or os_type == "windows": continue w += build_workflow_pair(btype, os_type, python_version, fb, prefix, upload) diff --git a/.github/workflows/build-conda-windows.yml b/.github/workflows/build-conda-windows.yml index 30e8a63655..38bfb6307f 100644 --- a/.github/workflows/build-conda-windows.yml +++ b/.github/workflows/build-conda-windows.yml @@ -8,9 +8,9 @@ on: - 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]+ + # 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: @@ -30,7 +30,7 @@ jobs: include: - repository: pytorch/text pre-script: packaging/install_torchdata.sh - post-script: "" + post-script: '' conda-package-directory: packaging/torchtext smoke-test-script: test/smoke_tests/smoke_tests.py package-name: torchtext @@ -39,7 +39,7 @@ jobs: with: conda-package-directory: ${{ matrix.conda-package-directory }} repository: ${{ matrix.repository }} - ref: "" + ref: '' test-infra-repository: pytorch/test-infra test-infra-ref: main build-matrix: ${{ needs.generate-matrix.outputs.matrix }} @@ -47,8 +47,6 @@ jobs: 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: development + trigger-event: ${{ github.event_name }} secrets: CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }} diff --git a/.github/workflows/build-wheels-windows.yml b/.github/workflows/build-wheels-windows.yml index b98bc06cc5..7cb5cda2bf 100644 --- a/.github/workflows/build-wheels-windows.yml +++ b/.github/workflows/build-wheels-windows.yml @@ -8,9 +8,9 @@ on: - 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]+ + # 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: @@ -31,14 +31,14 @@ jobs: - repository: pytorch/text pre-script: packaging/install_torchdata.sh env-script: packaging/vc_env_helper.bat - post-script: "" + post-script: '' smoke-test-script: test/smoke_tests/smoke_tests.py package-name: torchtext name: ${{ matrix.repository }} uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@main with: repository: ${{ matrix.repository }} - ref: "" + ref: '' test-infra-repository: pytorch/test-infra test-infra-ref: main build-matrix: ${{ needs.generate-matrix.outputs.matrix }} @@ -47,9 +47,7 @@ jobs: 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: development + trigger-event: ${{ github.event_name }} secrets: AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID: ${{ secrets.AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID }} AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY: ${{ secrets.AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY }}