fix(tests): fix TestSceneHyperDashColouring TestSkin to use legacy resources (hasPear=true)

TestSkin was using null resource store, causing CatchLegacySkinTransformer
to see hasPear=false and return null for the fruit component. This caused
SkinnableDrawable to fall back to DefaultFruitPiece, which always uses
DEFAULT_HYPER_DASH_COLOUR regardless of skin config.

Fix: implement IStorageResourceProvider in the test scene and pass it to
TestSkin, which now uses a NamespacedResourceStore pointing to the built-in
legacy skin assets (Skins/Legacy). This makes hasPear=true, returning
LegacyFruitPiece, which correctly reads hyper-dash colours from skin config.

Also fix iOS CI workflow: resolve MacOSX.sdk symlink target to its canonical
path (via python3 os.path.realpath) to prevent ELOOP (too many symlink levels)
when the symlink target is itself a symlink chain.

Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/18bebe86-a7b2-4d08-815c-3cad3370ec69

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>

Author: Copilot

.github/workflows/ci.yml

@@ -325,9 +325,11 @@ jobs:
             ACTIVE_DEV="$(xcode-select -p)"
             ACTIVE_SDKS_DIR="$ACTIVE_DEV/Platforms/MacOSX.platform/Developer/SDKs"
             MACOS_SDK="$ACTIVE_SDKS_DIR/MacOSX.sdk"
+            # Resolve REAL_SDK to its canonical (symlink-free) path to prevent ELOOP errors.
+            REAL_SDK_CANON=$(python3 -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$REAL_SDK" 2>/dev/null || echo "$REAL_SDK")
             sudo rm -rf "$MACOS_SDK"
-            sudo ln -sfn "$REAL_SDK" "$MACOS_SDK"
-            echo "Created MacOSX.sdk symlink -> $REAL_SDK"
+            sudo ln -sfn "$REAL_SDK_CANON" "$MACOS_SDK"
+            echo "Created MacOSX.sdk symlink -> $REAL_SDK_CANON"
           else
             echo "WARNING: no valid macOS SDK found; build may fail"
           fi

osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs

@@ -7,12 +7,19 @@
 using System.Numerics;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Database;
+using osu.Game.IO;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Skinning;
@@ -23,23 +30,26 @@
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public partial class TestSceneHyperDashColouring : OsuTestScene
+    public partial class TestSceneHyperDashColouring : OsuTestScene, IStorageResourceProvider
     {
         [Resolved]
         private SkinManager skins { get; set; }
 
+        [Resolved]
+        private GameHost host { get; set; } = null!;
+
         [Test]
         public void TestDefaultCatcherColour()
         {
-            var skin = new TestSkin();
+            var skin = new TestSkin(this);
 
             checkHyperDashCatcherColour(skin, Catcher.DEFAULT_HYPER_DASH_COLOUR);
         }
 
         [Test]
         public void TestCustomCatcherColour()
         {
-            var skin = new TestSkin
+            var skin = new TestSkin(this)
             {
                 HyperDashColour = Colour4.Goldenrod
             };
@@ -50,7 +60,7 @@ public void TestCustomCatcherColour()
         [Test]
         public void TestCustomAfterImageColour()
         {
-            var skin = new TestSkin
+            var skin = new TestSkin(this)
             {
                 HyperDashAfterImageColour = Colour4.Lime
             };
@@ -61,7 +71,7 @@ public void TestCustomAfterImageColour()
         [Test]
         public void TestCustomAfterImageColourPriority()
         {
-            var skin = new TestSkin
+            var skin = new TestSkin(this)
             {
                 HyperDashColour = Colour4.Goldenrod,
                 HyperDashAfterImageColour = Colour4.Lime
@@ -73,15 +83,15 @@ public void TestCustomAfterImageColourPriority()
         [Test]
         public void TestDefaultFruitColour()
         {
-            var skin = new TestSkin();
+            var skin = new TestSkin(this);
 
             checkHyperDashFruitColour(skin, Catcher.DEFAULT_HYPER_DASH_COLOUR);
         }
 
         [Test]
         public void TestCustomFruitColour()
         {
-            var skin = new TestSkin
+            var skin = new TestSkin(this)
             {
                 HyperDashFruitColour = Colour4.Cyan
             };
@@ -92,7 +102,7 @@ public void TestCustomFruitColour()
         [Test]
         public void TestCustomFruitColourPriority()
         {
-            var skin = new TestSkin
+            var skin = new TestSkin(this)
             {
                 HyperDashColour = Colour4.Goldenrod,
                 HyperDashFruitColour = Colour4.Cyan
@@ -104,7 +114,7 @@ public void TestCustomFruitColourPriority()
         [Test]
         public void TestFruitColourFallback()
         {
-            var skin = new TestSkin
+            var skin = new TestSkin(this)
             {
                 HyperDashColour = Colour4.Goldenrod
             };
@@ -209,10 +219,21 @@ public Colour4 HyperDashFruitColour
                 set => Configuration.CustomColours[nameof(CatchSkinColour.HyperDashFruit)] = value;
             }
 
-            public TestSkin()
-                : base(new SkinInfo(), null, null, string.Empty)
+            public TestSkin(IStorageResourceProvider resources)
+                : base(new SkinInfo(), resources, new NamespacedResourceStore<byte[]>(resources.Resources, "Skins/Legacy"), string.Empty)
             {
             }
         }
+
+        #region IStorageResourceProvider
+
+        IRenderer IStorageResourceProvider.Renderer => host.Renderer;
+        AudioManager IStorageResourceProvider.AudioManager => Audio;
+        IResourceStore<byte[]> IStorageResourceProvider.Files => null!;
+        IResourceStore<byte[]> IStorageResourceProvider.Resources => base.Resources;
+        IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+        RealmAccess IStorageResourceProvider.RealmAccess => null!;
+
+        #endregion
     }
 }