Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
vision
Commits
300a8a40
Unverified
Commit
300a8a40
authored
Jun 15, 2021
by
Matti Picus
Committed by
GitHub
Jun 15, 2021
Browse files
backport fixes to build/push docs on tags (#4060)
parent
9d5561b1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
2 deletions
+20
-2
.circleci/config.yml
.circleci/config.yml
+11
-0
.circleci/regenerate.py
.circleci/regenerate.py
+9
-2
No files found.
.circleci/config.yml
View file @
300a8a40
...
@@ -1011,6 +1011,11 @@ workflows:
...
@@ -1011,6 +1011,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
...
@@ -1409,6 +1414,12 @@ workflows:
...
@@ -1409,6 +1414,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
:
-
/.*/
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
:
...
...
.circleci/regenerate.py
View file @
300a8a40
...
@@ -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
(
'/.*/'
)
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
}]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment