Skip to content

Commit 5ef49fb

Browse files
Update .circleci scripts to bring CMAKE_VERSION update to 3.18 needed for nightly upstream PyTorch docker builds
1 parent 115abd9 commit 5ef49fb

35 files changed

+760
-436
lines changed

.circleci/README.md

Lines changed: 468 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
from collections import OrderedDict
2-
from cimodel.lib.miniutils import quote
3-
from cimodel.data.simple.util.branch_filters import gen_filter_dict_exclude
4-
5-
61
class MacOsJob:
72
def __init__(self, os_version, is_build=False, is_test=False, extra_props=tuple()):
83
# extra_props is tuple type, because mutable data structures for argument defaults
@@ -55,94 +50,5 @@ def gen_tree(self):
5550
]
5651

5752

58-
def get_new_workflow_jobs():
59-
return [
60-
OrderedDict(
61-
{
62-
"mac_build": OrderedDict(
63-
{
64-
"name": "macos-12-py3-x86-64-build",
65-
"build-environment": "macos-12-py3-x86-64",
66-
"xcode-version": quote("13.3.1"),
67-
"filters": gen_filter_dict_exclude()
68-
}
69-
)
70-
}
71-
),
72-
OrderedDict(
73-
{
74-
"mac_test": OrderedDict(
75-
{
76-
"name": "macos-12-py3-x86-64-test-1-2-default",
77-
"build-environment": "macos-12-py3-x86-64",
78-
"xcode-version": quote("13.3.1"),
79-
"shard-number": quote("1"),
80-
"num-test-shards": quote("2"),
81-
"requires": ["macos-12-py3-x86-64-build"],
82-
"filters": gen_filter_dict_exclude()
83-
}
84-
)
85-
}
86-
),
87-
OrderedDict(
88-
{
89-
"mac_test": OrderedDict(
90-
{
91-
"name": "macos-12-py3-x86-64-test-2-2-default",
92-
"build-environment": "macos-12-py3-x86-64",
93-
"xcode-version": quote("13.3.1"),
94-
"shard-number": quote("2"),
95-
"num-test-shards": quote("2"),
96-
"requires": ["macos-12-py3-x86-64-build"],
97-
"filters": gen_filter_dict_exclude()
98-
}
99-
)
100-
}
101-
),
102-
OrderedDict(
103-
{
104-
"mac_test": OrderedDict(
105-
{
106-
"name": "macos-12-py3-x86-64-test-1-1-functorch",
107-
"build-environment": "macos-12-py3-x86-64",
108-
"xcode-version": quote("13.3.1"),
109-
"shard-number": quote("1"),
110-
"num-test-shards": quote("1"),
111-
"test-config": "functorch",
112-
"requires": ["macos-12-py3-x86-64-build"],
113-
"filters": gen_filter_dict_exclude()
114-
}
115-
)
116-
}
117-
),
118-
OrderedDict(
119-
{
120-
"mac_build": OrderedDict(
121-
{
122-
"name": "macos-12-py3-x86-64-lite-interpreter-build-test",
123-
"build-environment": "macos-12-py3-lite-interpreter-x86-64",
124-
"xcode-version": quote("13.3.1"),
125-
"build-generates-artifacts": "false",
126-
"filters": gen_filter_dict_exclude()
127-
}
128-
)
129-
}
130-
),
131-
OrderedDict(
132-
{
133-
"mac_build": OrderedDict(
134-
{
135-
"name": "macos-12-py3-arm64-build",
136-
"build-environment": "macos-12-py3-arm64",
137-
"xcode-version": quote("13.3.1"),
138-
"python-version": quote("3.9.12"),
139-
"filters": gen_filter_dict_exclude()
140-
}
141-
)
142-
}
143-
),
144-
]
145-
146-
14753
def get_workflow_jobs():
14854
return [item.gen_tree() for item in WORKFLOW_DATA]

.circleci/cimodel/data/simple/util/branch_filters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
RC_PATTERN = r"/v[0-9]+(\.[0-9]+)*-rc[0-9]+/"
1414

15-
MAC_IOS_EXCLUSION_LIST = ["master", "nightly", "postnightly"]
15+
MAC_IOS_EXCLUSION_LIST = ["nightly", "postnightly"]
1616

1717

1818
def gen_filter_dict(

.circleci/config.yml

Lines changed: 39 additions & 113 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)