Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1026,6 +1026,11 @@ workflows:
- binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu
filters:
branches:
only: '*'
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_linux_wheel_py3.7_cpu
python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102
Expand Down Expand Up @@ -1424,6 +1429,12 @@ workflows:
name: binary_win_conda_py3.9_cu111
python_version: '3.9'
- build_docs:
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: build_docs
python_version: '3.7'
requires:
Expand Down
11 changes: 9 additions & 2 deletions .circleci/regenerate.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,19 @@ def build_workflows(prefix='', filter_branch=None, upload=False, indentation=6,
(python_version != python_versions[-1] or
(cu_version not in [cu_versions[0], cu_versions[-1]])):
fb = "master"
if not fb and (os_type == 'linux' and
cu_version == 'cpu' and
btype == 'wheel' and
python_version == '3.7'):
# the fields must match the build_docs "requires" dependency
fb = "*"
w += workflow_pair(
btype, os_type, python_version, cu_version,
unicode, prefix, upload, filter_branch=fb)

if not filter_branch:
# Build on every pull request, but upload only on nightly and tags
w += build_doc_job(None)
w += build_doc_job('nightly')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mattip does this mean that the docs are not build on every PR anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm. It seems to be building on PRs, for instance taking a random PR and looking at the CI build I see a build_docs run 2/3 of the way down. Although I agree the filter says only nightly, so it is misleading.

      - build_docs:
          filters:
            branches:
              only:
              - nightly
            tags:
              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
          name: build_docs
          python_version: '3.7'
          requires:
          - binary_linux_wheel_py3.7_cpu

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm afraid the PR you're linking to was pushed before this one got merged.

In more recent commits, e.g. https://app.circleci.com/pipelines/github/pytorch/vision?branch=pull%2F3808 from this morning, I do not see the build_docs job.

w += upload_doc_job('nightly')
return indent(indentation, w)

Expand Down Expand Up @@ -83,7 +89,8 @@ def build_doc_job(filter_branch):
}

if filter_branch:
job["filters"] = gen_filter_branch_tree(filter_branch)
job["filters"] = gen_filter_branch_tree(filter_branch,
tags_list=RC_PATTERN)
return [{"build_docs": job}]


Expand Down