Unverified Commit 26d6080f authored by Matti Picus's avatar Matti Picus Committed by GitHub
Browse files

add filter for binary_linux_wheel_py3.7_cpu (#3998)

* add filter for binary_linux_wheel_py3.7_cpu
fixes issue #3997

* add tag,nightly filter to build_docs

* flake8 formatting

* fixes from review
parent 7dc8a690
...@@ -1026,6 +1026,11 @@ workflows: ...@@ -1026,6 +1026,11 @@ workflows:
- binary_linux_wheel: - binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
filters:
branches:
only: '*'
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_linux_wheel_py3.7_cpu name: binary_linux_wheel_py3.7_cpu
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cuda102
...@@ -1424,6 +1429,12 @@ workflows: ...@@ -1424,6 +1429,12 @@ workflows:
name: binary_win_conda_py3.9_cu111 name: binary_win_conda_py3.9_cu111
python_version: '3.9' python_version: '3.9'
- build_docs: - build_docs:
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: build_docs name: build_docs
python_version: '3.7' python_version: '3.7'
requires: requires:
......
...@@ -45,13 +45,19 @@ def build_workflows(prefix='', filter_branch=None, upload=False, indentation=6, ...@@ -45,13 +45,19 @@ def build_workflows(prefix='', filter_branch=None, upload=False, indentation=6,
(python_version != python_versions[-1] or (python_version != python_versions[-1] or
(cu_version not in [cu_versions[0], cu_versions[-1]])): (cu_version not in [cu_versions[0], cu_versions[-1]])):
fb = "master" 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( w += workflow_pair(
btype, os_type, python_version, cu_version, btype, os_type, python_version, cu_version,
unicode, prefix, upload, filter_branch=fb) unicode, prefix, upload, filter_branch=fb)
if not filter_branch: if not filter_branch:
# Build on every pull request, but upload only on nightly and tags # Build on every pull request, but upload only on nightly and tags
w += build_doc_job(None) w += build_doc_job('nightly')
w += upload_doc_job('nightly') w += upload_doc_job('nightly')
return indent(indentation, w) return indent(indentation, w)
...@@ -83,7 +89,8 @@ def build_doc_job(filter_branch): ...@@ -83,7 +89,8 @@ def build_doc_job(filter_branch):
} }
if 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}] return [{"build_docs": job}]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment