Skip to content

Fix CI test failure: TestFruitColourFallback in catch ruleset #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
winnerspiros merged 2 commits into from
May 19, 2026
Merged

Fix CI test failure: TestFruitColourFallback in catch ruleset #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3701fb
Fix 3 CI errors: osuTK reference, unused field, and null check simpli…
Copilot May 19, 2026
19845e2
Fix TestFruitColourFallback: use AddUntilStep and explicit SRGB compa…
Copilot May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ private void checkHyperDashFruitColour(ISkin skin, Colour4 expectedColour)
}, skin);
});

AddAssert("hyper-dash colour is correct", () => checkLegacyFruitHyperDashColour(drawableFruit, expectedColour));
AddUntilStep("hyper-dash colour is correct", () => checkLegacyFruitHyperDashColour(drawableFruit, expectedColour));
}

private Drawable setupSkinHierarchy(Drawable child, ISkin skin)
Expand All @@ -187,7 +187,7 @@ private Drawable setupSkinHierarchy(Drawable child, ISkin skin)

private bool checkLegacyFruitHyperDashColour(DrawableFruit fruit, Colour4 expectedColour) =>
fruit.ChildrenOfType<SkinnableDrawable>().FirstOrDefault()?.Drawable.ChildrenOfType<Sprite>()
.Any(c => c.Colour == expectedColour) == true;
.Any(c => c.Colour.TopLeft.SRGB == expectedColour) == true;

private class TestSkin : LegacySkin
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Osu/Edit/OsuSliderVelocityToolboxGroup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Screens.Edit;
using osuTK;
using System.Numerics;

namespace osu.Game.Rulesets.Osu.Edit
{
Expand Down
3 changes: 1 addition & 2 deletions osu.Game/Screens/Edit/Components/FormSampleSet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,7 @@ private void updateState()

recycleSamples();

if (triangles != null)
triangles.Colour = ColourInfo.GradientVertical(triangleGradientSecondColour ?? default, BackgroundColour);
triangles?.Colour = ColourInfo.GradientVertical(triangleGradientSecondColour ?? default, BackgroundColour);
}

private void recycleSamples() => Schedule(() =>
Expand Down
2 changes: 0 additions & 2 deletions osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,6 @@ private void onMatchmakingLobbyStatusChanged(MatchmakingLobbyStatus status) => S
loadRecentMatches(status.RecentMatches.OfType<RankedPlayRoomState>().ToArray()).FireAndForget();
});

private int historyInsertOrder;

private async Task loadRecentMatches(RankedPlayRoomState[] matches)
{
// matches initial API response.
Expand Down
Loading