Skip to content

Commit a62b715

Browse files
authored
Enable resource tests on CI (#2816)
1 parent d20fc44 commit a62b715

File tree

3 files changed

+11
-21
lines changed

3 files changed

+11
-21
lines changed

test/starlark_tests/ios_application_resources_test.bzl

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ def ios_application_resources_test_suite(name):
209209
plist_test_values = {
210210
"CFBundleIcons:CFBundlePrimaryIcon:CFBundleIconName": "app_icon",
211211
},
212-
# Skip CI until CI is on Xcode 26
213-
tags = [name] + common.fixture_tags + common.skip_ci_tags,
212+
tags = [name] + common.fixture_tags,
214213
)
215214

216215
# Test a failure when the new icon composer bundles for Xcode 26 are mixed with a set of asset \
@@ -222,8 +221,7 @@ def ios_application_resources_test_suite(name):
222221
Found .appiconset files among the assigned app_icons, which are ignored when Icon \
223222
Composer .icon bundles are present.
224223
""",
225-
# Skip CI until CI is on Xcode 26
226-
tags = [name] + common.skip_ci_tags,
224+
tags = [name],
227225
)
228226

229227
# Tests that icon bundles alone will generate legacy assets when the minimum_os_version is lower
@@ -242,8 +240,7 @@ def ios_application_resources_test_suite(name):
242240
"CFBundleIcons:CFBundlePrimaryIcon:CFBundleIconFiles:0": "app_icon60x60",
243241
"CFBundleIcons:CFBundlePrimaryIcon:CFBundleIconName": "app_icon",
244242
},
245-
# Skip CI until CI is on Xcode 26
246-
tags = [name] + common.fixture_tags + common.skip_ci_tags,
243+
tags = [name] + common.fixture_tags,
247244
)
248245

249246
# Tests that icon composer icons must be provided when the minimum_os_version is 26.0 or higher.
@@ -256,8 +253,7 @@ Legacy .appiconset files should not be used on iOS/macOS/watchOS 26+.
256253
These platforms prefer Icon Composer .icon bundles. .appiconset files are only needed for rendering icons in iOS/macOS/watchOS prior to 26.
257254
258255
Found the following legacy .appiconset files: """,
259-
# Skip CI until CI is on Xcode 26
260-
tags = [name] + common.skip_ci_tags,
256+
tags = [name],
261257
)
262258

263259
# Test a failure when new icon composer bundles for Xcode 26 are mixed with a set of asset
@@ -269,8 +265,7 @@ Found the following legacy .appiconset files: """,
269265
Found .appiconset files among the assigned app_icons, which are ignored when Icon \
270266
Composer .icon bundles are present.
271267
""",
272-
# Skip CI until CI is on Xcode 26
273-
tags = [name] + common.skip_ci_tags,
268+
tags = [name],
274269
)
275270

276271
# Tests that icon composer icons will be flagged when building against Xcode 16 instead of 26.
@@ -279,9 +274,8 @@ Found the following legacy .appiconset files: """,
279274
target_under_test = "//test/starlark_tests/targets_under_test/ios:app_with_icon_bundle_only_for_low_minimum_os_version",
280275
expected_error = """
281276
Found Icon Composer .icon bundles among the assigned app_icons. These are only supported on Xcode 26 or later.""",
282-
tags = [
283-
name,
284-
] + common.skip_ci_tags,
277+
# Skip on CI since we no longer run tests using Xcode 16.
278+
tags = [name] + common.skip_ci_tags,
285279
)
286280

287281
# Tests that the launch storyboard is bundled with the application and that

test/starlark_tests/macos_application_resources_tests.bzl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ def macos_application_resources_test_suite(name):
5454
plist_test_values = {
5555
"CFBundleIconName": "app_icon",
5656
},
57-
# Skip CI until CI is on Xcode 26
58-
tags = [name] + common.fixture_tags + common.skip_ci_tags,
57+
tags = [name] + common.fixture_tags,
5958
)
6059

6160
# Test a failure when using new icon composer bundles for Xcode 26 with a set of asset catalog
@@ -67,8 +66,7 @@ def macos_application_resources_test_suite(name):
6766
Found .appiconset files among the assigned app_icons, which are ignored when Icon \
6867
Composer .icon bundles are present.
6968
""",
70-
# Skip CI until CI is on Xcode 26
71-
tags = [name] + common.skip_ci_tags,
69+
tags = [name],
7270
)
7371

7472
# Tests that various nonlocalized resource types are bundled correctly with

test/starlark_tests/watchos_single_target_application_tests.bzl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ delegate is referenced in the single-target `watchos_application`'s `deps`.
162162
plist_test_values = {
163163
"CFBundleIcons:CFBundlePrimaryIcon:CFBundleIconName": "app_icon",
164164
},
165-
# Skip CI until CI is on Xcode 26
166-
tags = [name] + common.fixture_tags + common.skip_ci_tags,
165+
tags = [name] + common.fixture_tags,
167166
)
168167

169168
# Test for a failure when the new icon composer bundles for Xcode 26 are assigned with a set
@@ -175,8 +174,7 @@ delegate is referenced in the single-target `watchos_application`'s `deps`.
175174
Found .appiconset files among the assigned app_icons, which are ignored when Icon \
176175
Composer .icon bundles are present.
177176
""",
178-
# Skip CI until CI is on Xcode 26
179-
tags = [name] + common.skip_ci_tags,
177+
tags = [name],
180178
)
181179

182180
# Tests xcasset tool is passed the correct arguments.

0 commit comments

Comments
 (0)