Skip to content

Commit

Permalink
Run only on master
Browse files Browse the repository at this point in the history
  • Loading branch information
mthrok committed May 5, 2020
1 parent 3bf7f2a commit 851f8e2
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 18 deletions.
14 changes: 9 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,6 @@ jobs:
command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/post_process.sh
- store_test_results:
path: test-results
# filters:
# branches:
# only:
# - master
# - nightly

unittest_windows_cpu:
<<: *binary_common
Expand Down Expand Up @@ -393,12 +388,21 @@ workflows:
name: unittest_linux_cpu_py3.8
python_version: '3.8'
- unittest_linux_gpu:
filters:
branches:
only: master
name: unittest_linux_gpu_py3.6
python_version: '3.6'
- unittest_linux_gpu:
filters:
branches:
only: master
name: unittest_linux_gpu_py3.7
python_version: '3.7'
- unittest_linux_gpu:
filters:
branches:
only: master
name: unittest_linux_gpu_py3.8
python_version: '3.8'
- unittest_windows_cpu:
Expand Down
5 changes: 0 additions & 5 deletions .circleci/config.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,6 @@ jobs:
command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/post_process.sh
- store_test_results:
path: test-results
# filters:
# branches:
# only:
# - master
# - nightly

unittest_windows_cpu:
<<: *binary_common
Expand Down
18 changes: 10 additions & 8 deletions .circleci/regenerate.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,19 +111,21 @@ def indent(indentation, data_list):


def unittest_workflows(indentation=6):
w = []
jobs = []
for os_type in ["linux", "windows"]:
for device_type in ["cpu", "gpu"]:
if os_type == 'windows' and device_type == 'gpu':
continue
for python_version in PYTHON_VERSIONS:
w.append({
f"unittest_{os_type}_{device_type}": {
"name": f"unittest_{os_type}_{device_type}_py{python_version}",
"python_version": python_version,
}
})
return indent(indentation, w)
job = {
"name": f"unittest_{os_type}_{device_type}_py{python_version}",
"python_version": python_version,
}

if device_type == 'gpu':
job['filters'] = gen_filter_branch_tree('master')
jobs.append({f"unittest_{os_type}_{device_type}": job})
return indent(indentation, jobs)


if __name__ == "__main__":
Expand Down

0 comments on commit 851f8e2

Please sign in to comment.