Skip to content

Commit b6aec5c

Browse files
ncreatedncreated
authored
Merge pull request #908 from DataDog/ncreated/fix-gh-asset-distribution-task
Make `*.swiftinterface` validation flexible in XCFrameworks distribution
2 parents ef343b1 + 3c44264 commit b6aec5c

File tree

1 file changed

+14
-41
lines changed

1 file changed

+14
-41
lines changed

‎tools/distribution/src/release/assets/gh_asset.py

+14-41
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,11 @@ def validate(self, zip_directory: DirectoryMatcher, in_version: Version) -> bool
3636
'ios-arm64',
3737
'ios-arm64/BCSymbolMaps/*.bcsymbolmap',
3838
'ios-arm64/dSYMs/*.dSYM',
39-
'ios-arm64/**/arm64.swiftinterface',
40-
'ios-arm64/**/arm64-apple-ios.swiftinterface',
39+
'ios-arm64/**/*.swiftinterface',
4140

4241
'ios-arm64_x86_64-simulator',
4342
'ios-arm64_x86_64-simulator/dSYMs/*.dSYM',
44-
'ios-arm64_x86_64-simulator/**/arm64.swiftinterface',
45-
'ios-arm64_x86_64-simulator/**/arm64-apple-ios-simulator.swiftinterface',
46-
'ios-arm64_x86_64-simulator/**/x86_64.swiftinterface',
47-
'ios-arm64_x86_64-simulator/**/x86_64-apple-ios-simulator.swiftinterface',
43+
'ios-arm64_x86_64-simulator/**/*.swiftinterface',
4844
])
4945

5046
if in_version.is_older_than(min_tvos_version):
@@ -54,15 +50,11 @@ def validate(self, zip_directory: DirectoryMatcher, in_version: Version) -> bool
5450
'tvos-arm64',
5551
'tvos-arm64/BCSymbolMaps/*.bcsymbolmap',
5652
'tvos-arm64/dSYMs/*.dSYM',
57-
'tvos-arm64/**/arm64.swiftinterface',
58-
'tvos-arm64/**/arm64-apple-tvos.swiftinterface',
53+
'tvos-arm64/**/*.swiftinterface',
5954

6055
'tvos-arm64_x86_64-simulator',
6156
'tvos-arm64_x86_64-simulator/dSYMs/*.dSYM',
62-
'tvos-arm64_x86_64-simulator/**/arm64.swiftinterface',
63-
'tvos-arm64_x86_64-simulator/**/arm64-apple-tvos-simulator.swiftinterface',
64-
'tvos-arm64_x86_64-simulator/**/x86_64.swiftinterface',
65-
'tvos-arm64_x86_64-simulator/**/x86_64-apple-tvos-simulator.swiftinterface',
57+
'tvos-arm64_x86_64-simulator/**/*.swiftinterface',
6658
])
6759

6860
return True
@@ -79,14 +71,10 @@ def validate(self, zip_directory: DirectoryMatcher, in_version: Version) -> bool
7971
'ios-arm64',
8072
'ios-arm64/BCSymbolMaps/*.bcsymbolmap',
8173
'ios-arm64/dSYMs/*.dSYM',
82-
'ios-arm64/**/arm64.swiftinterface',
83-
'ios-arm64/**/arm64-apple-ios.swiftinterface',
74+
'ios-arm64/**/*.swiftinterface',
8475

8576
'ios-arm64_x86_64-simulator',
86-
'ios-arm64_x86_64-simulator/**/arm64.swiftinterface',
87-
'ios-arm64_x86_64-simulator/**/arm64-apple-ios-simulator.swiftinterface',
88-
'ios-arm64_x86_64-simulator/**/x86_64.swiftinterface',
89-
'ios-arm64_x86_64-simulator/**/x86_64-apple-ios-simulator.swiftinterface',
77+
'ios-arm64_x86_64-simulator/**/*.swiftinterface',
9078
])
9179

9280
if in_version.is_older_than(min_tvos_version):
@@ -96,14 +84,10 @@ def validate(self, zip_directory: DirectoryMatcher, in_version: Version) -> bool
9684
'tvos-arm64',
9785
'tvos-arm64/BCSymbolMaps/*.bcsymbolmap',
9886
'tvos-arm64/dSYMs/*.dSYM',
99-
'tvos-arm64/**/arm64.swiftinterface',
100-
'tvos-arm64/**/arm64-apple-tvos.swiftinterface',
87+
'tvos-arm64/**/*.swiftinterface',
10188

10289
'tvos-arm64_x86_64-simulator',
103-
'tvos-arm64_x86_64-simulator/**/arm64.swiftinterface',
104-
'tvos-arm64_x86_64-simulator/**/arm64-apple-tvos-simulator.swiftinterface',
105-
'tvos-arm64_x86_64-simulator/**/x86_64.swiftinterface',
106-
'tvos-arm64_x86_64-simulator/**/x86_64-apple-tvos-simulator.swiftinterface',
90+
'tvos-arm64_x86_64-simulator/**/*.swiftinterface',
10791
])
10892

10993
return True
@@ -120,13 +104,11 @@ def validate(self, zip_directory: DirectoryMatcher, in_version: Version) -> bool
120104
dir.assert_it_has_files([
121105
'ios-arm64',
122106
'ios-arm64/BCSymbolMaps/*.bcsymbolmap',
123-
'ios-arm64/**/arm64.swiftinterface',
124-
'ios-arm64/**/arm64-apple-ios.swiftinterface',
107+
'ios-arm64/**/*.swiftinterface',
125108

126109
'ios-arm64_x86_64-simulator',
127110
'ios-arm64_x86_64-simulator/dSYMs/*.dSYM',
128-
'ios-arm64_x86_64-simulator/**/x86_64.swiftinterface',
129-
'ios-arm64_x86_64-simulator/**/x86_64-apple-ios-simulator.swiftinterface',
111+
'ios-arm64_x86_64-simulator/**/*.swiftinterface',
130112
])
131113

132114
if in_version.is_older_than(min_tvos_version):
@@ -135,13 +117,11 @@ def validate(self, zip_directory: DirectoryMatcher, in_version: Version) -> bool
135117
dir.assert_it_has_files([
136118
'tvos-arm64',
137119
'tvos-arm64/BCSymbolMaps/*.bcsymbolmap',
138-
'tvos-arm64/**/arm64.swiftinterface',
139-
'tvos-arm64/**/arm64-apple-tvos.swiftinterface',
120+
'tvos-arm64/**/*.swiftinterface',
140121

141122
'tvos-arm64_x86_64-simulator',
142123
'tvos-arm64_x86_64-simulator/dSYMs/*.dSYM',
143-
'tvos-arm64_x86_64-simulator/**/x86_64.swiftinterface',
144-
'tvos-arm64_x86_64-simulator/**/x86_64-apple-tvos-simulator.swiftinterface',
124+
'tvos-arm64_x86_64-simulator/**/*.swiftinterface',
145125
])
146126

147127
return True
@@ -184,18 +164,11 @@ def validate(self, zip_directory: DirectoryMatcher, in_version: Version) -> bool
184164
'ios-arm64_armv7',
185165
'ios-arm64_armv7/BCSymbolMaps/*.bcsymbolmap',
186166
'ios-arm64_armv7/dSYMs/*.dSYM',
187-
'ios-arm64_armv7/**/arm.swiftinterface',
188-
'ios-arm64_armv7/**/arm64-apple-ios.swiftinterface',
189-
'ios-arm64_armv7/**/arm64.swiftinterface',
190-
'ios-arm64_armv7/**/armv7-apple-ios.swiftinterface',
191-
'ios-arm64_armv7/**/armv7.swiftinterface',
167+
'ios-arm64_armv7/**/*.swiftinterface',
192168

193169
'ios-arm64_i386_x86_64-simulator',
194170
'ios-arm64_i386_x86_64-simulator/dSYMs/*.dSYM',
195-
'ios-arm64_i386_x86_64-simulator/**/arm64-apple-ios-simulator.swiftinterface',
196-
'ios-arm64_i386_x86_64-simulator/**/i386-apple-ios-simulator.swiftinterface',
197-
'ios-arm64_i386_x86_64-simulator/**/x86_64-apple-ios-simulator.swiftinterface',
198-
'ios-arm64_i386_x86_64-simulator/**/x86_64.swiftinterface',
171+
'ios-arm64_i386_x86_64-simulator/**/*.swiftinterface',
199172
])
200173

201174
return True

0 commit comments

Comments
 (0)