Skip to content
Continuous Integration

Merge remote-tracking branch 'upstream/master' into performanceplus-m… #635

Sign in to view logs

Merge remote-tracking branch 'upstream/master' into performanceplus-m…

Merge remote-tracking branch 'upstream/master' into performanceplus-m… #635

Triggered via push November 22, 2024 04:24
@cdwcgtcdwcgt
pushed 129800e
performanceplus-modify
Status Failure
Total duration 3m 30s
Artifacts –

ci.yml

on: push
Code Quality
45s
Code Quality
Build only (Android)
3m 17s
Build only (Android)
Build only (iOS)
1m 28s
Build only (iOS)
Matrix: Test
Fit to window
Zoom out
Zoom in

Annotations

52 errors and 4 warnings
Test (Linux, ubuntu-latest, SingleThread): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
Test (Linux, ubuntu-latest, SingleThread): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
Test (Linux, ubuntu-latest, SingleThread): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
Test (Linux, ubuntu-latest, SingleThread): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
Test (Linux, ubuntu-latest, SingleThread): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
Test (Linux, ubuntu-latest, SingleThread): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
Test (Linux, ubuntu-latest, SingleThread)
Process completed with exit code 1.
Test (Linux, ubuntu-latest, MultiThreaded): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
Test (Linux, ubuntu-latest, MultiThreaded): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
Test (Linux, ubuntu-latest, MultiThreaded): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
Test (Linux, ubuntu-latest, MultiThreaded): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
Test (Linux, ubuntu-latest, MultiThreaded): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
Test (Linux, ubuntu-latest, MultiThreaded): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
Test (Linux, ubuntu-latest, MultiThreaded)
Process completed with exit code 1.
Code Quality: osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
Code Quality: osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
Code Quality: osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
Code Quality: osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
Code Quality: osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
Code Quality: osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
Code Quality
Process completed with exit code 1.
Build only (iOS): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
Build only (iOS): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
Build only (iOS): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
Build only (iOS): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
Build only (iOS): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
Build only (iOS): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
Build only (iOS)
Process completed with exit code 1.
Test (Windows, windows-latest, MultiThreaded): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
Test (Windows, windows-latest, MultiThreaded): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
Test (Windows, windows-latest, MultiThreaded): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
Test (Windows, windows-latest, MultiThreaded): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
Test (Windows, windows-latest, MultiThreaded): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
Test (Windows, windows-latest, MultiThreaded): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
Test (Windows, windows-latest, MultiThreaded)
Process completed with exit code 1.
Test (Windows, windows-latest, SingleThread): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
Test (Windows, windows-latest, SingleThread): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
Test (Windows, windows-latest, SingleThread): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
Test (Windows, windows-latest, SingleThread): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
Test (Windows, windows-latest, SingleThread): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
Test (Windows, windows-latest, SingleThread): osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
Test (Windows, windows-latest, SingleThread)
Process completed with exit code 1.
Build only (Android)
The target platform identifier android was not recognized.
Build only (Android)
The target platform identifier android was not recognized.
Build only (Android)
The target platform identifier android was not recognized.
Build only (Android)
The target platform identifier android was not recognized.
Build only (Android)
The target platform identifier android was not recognized.
Build only (Android)
The target platform identifier android was not recognized.
Build only (Android)
The target platform identifier android was not recognized.
Build only (Android)
The target platform identifier android was not recognized.
Build only (Android)
The target platform identifier android was not recognized.
Build only (Android)
The target platform identifier android was not recognized.
Test (Linux, ubuntu-latest, SingleThread)
No files were found with the provided path: /home/runner/work/osu/osu/TestResults/TestResults-Linux-SingleThread.trx. No artifacts will be uploaded.
Test (Linux, ubuntu-latest, MultiThreaded)
No files were found with the provided path: /home/runner/work/osu/osu/TestResults/TestResults-Linux-MultiThreaded.trx. No artifacts will be uploaded.
Test (Windows, windows-latest, MultiThreaded)
No files were found with the provided path: D:\a\osu\osu/TestResults/TestResults-Windows-MultiThreaded.trx. No artifacts will be uploaded.
Test (Windows, windows-latest, SingleThread)
No files were found with the provided path: D:\a\osu\osu/TestResults/TestResults-Windows-SingleThread.trx. No artifacts will be uploaded.