fixup! revert formatting changes

MingxuanGame · Mar 27, 2023 · 433f9e5 · 433f9e5
1 parent 3d032d0
commit 433f9e5
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 84 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,12 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Help
-    url: https://github.com/ppy/osu/discussions/categories/q-a
-    about: osu! not working as you'd expect? Not sure it's a bug? Check the Q&A section!
-  - name: Suggestions or feature request
-    url: https://github.com/ppy/osu/discussions/categories/ideas
-    about: Got something you think should change or be added? Search for or start a new discussion!
-  - name: osu!stable issues
-    url: https://github.com/ppy/osu-stable-issues
-    about: For osu!(stable) - ie. the current "live" game version, check out the dedicated repository. Note that this is for serious bug reports only, not tech support.
+    - name: Help
+      url: https://github.com/ppy/osu/discussions/categories/q-a
+      about: osu! not working as you'd expect? Not sure it's a bug? Check the Q&A section!
+    - name: Suggestions or feature request
+      url: https://github.com/ppy/osu/discussions/categories/ideas
+      about: Got something you think should change or be added? Search for or start a new discussion!
+    - name: osu!stable issues
+      url: https://github.com/ppy/osu-stable-issues
+      about: For osu!(stable) - ie. the current "live" game version, check out the dedicated repository. Note that this is for serious bug reports only, not tech support.
+
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,46 +1,46 @@
 version: 2
 updates:
-  - package-ecosystem: nuget
-    directory: "/"
-    schedule:
-      interval: monthly
-      time: "17:00"
-    open-pull-requests-limit: 0 # disabled until https://github.com/dependabot/dependabot-core/issues/369 is resolved.
-    ignore:
-      - dependency-name: Microsoft.EntityFrameworkCore.Design
-        versions:
-          - "> 2.2.6"
-      - dependency-name: Microsoft.EntityFrameworkCore.Sqlite
-        versions:
-          - "> 2.2.6"
-      - dependency-name: Microsoft.EntityFrameworkCore.Sqlite.Core
-        versions:
-          - "> 2.2.6"
-      - dependency-name: Microsoft.Extensions.DependencyInjection
-        versions:
-          - ">= 5.a, < 6"
-      - dependency-name: NUnit3TestAdapter
-        versions:
-          - ">= 3.16.a, < 3.17"
-      - dependency-name: Microsoft.NET.Test.Sdk
-        versions:
-          - 16.9.1
-      - dependency-name: Microsoft.Extensions.DependencyInjection
-        versions:
-          - 3.1.11
-          - 3.1.12
-      - dependency-name: Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
-        versions:
-          - 3.1.11
-      - dependency-name: Microsoft.NETCore.Targets
-        versions:
-          - 5.0.0
-      - dependency-name: Microsoft.AspNetCore.SignalR.Protocols.MessagePack
-        versions:
-          - 5.0.2
-      - dependency-name: NUnit
-        versions:
-          - 3.13.1
-      - dependency-name: Microsoft.AspNetCore.SignalR.Client
-        versions:
-          - 3.1.11
+- package-ecosystem: nuget
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: "17:00"
+  open-pull-requests-limit: 0 # disabled until https://github.com/dependabot/dependabot-core/issues/369 is resolved.
+  ignore:
+  - dependency-name: Microsoft.EntityFrameworkCore.Design
+    versions:
+    - "> 2.2.6"
+  - dependency-name: Microsoft.EntityFrameworkCore.Sqlite
+    versions:
+    - "> 2.2.6"
+  - dependency-name: Microsoft.EntityFrameworkCore.Sqlite.Core
+    versions:
+    - "> 2.2.6"
+  - dependency-name: Microsoft.Extensions.DependencyInjection
+    versions:
+    - ">= 5.a, < 6"
+  - dependency-name: NUnit3TestAdapter
+    versions:
+    - ">= 3.16.a, < 3.17"
+  - dependency-name: Microsoft.NET.Test.Sdk
+    versions:
+    - 16.9.1
+  - dependency-name: Microsoft.Extensions.DependencyInjection
+    versions:
+    - 3.1.11
+    - 3.1.12
+  - dependency-name: Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
+    versions:
+    - 3.1.11
+  - dependency-name: Microsoft.NETCore.Targets
+    versions:
+    - 5.0.0
+  - dependency-name: Microsoft.AspNetCore.SignalR.Protocols.MessagePack
+    versions:
+    - 5.0.2
+  - dependency-name: NUnit
+    versions:
+    - 3.13.1
+  - dependency-name: Microsoft.AspNetCore.SignalR.Client
+    versions:
+    - 3.1.11
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,21 +59,21 @@ jobs:
         run: dotnet jb inspectcode $(pwd)/osu.Desktop.slnf --no-build --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN
 
       - name: NVika
-        run: dotnet nvika parsereport "${{ github.workspace }}/inspectcodereport.xml" --treatwarningsaserrors
+        run: dotnet nvika parsereport "${{github.workspace}}/inspectcodereport.xml" --treatwarningsaserrors
 
   test:
     name: Test
-    runs-on: ${{ matrix.os.fullname }}
+    runs-on: ${{matrix.os.fullname}}
     env:
-      OSU_EXECUTION_MODE: ${{ matrix.threadingMode }}
+      OSU_EXECUTION_MODE: ${{matrix.threadingMode}}
     strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - { prettyname: Windows, fullname: windows-latest }
-          - { prettyname: macOS, fullname: macos-latest }
-          - { prettyname: Linux, fullname: ubuntu-latest }
-        threadingMode: ["SingleThread", "MultiThreaded"]
+       fail-fast: false
+       matrix:
+          os:
+            - { prettyname: Windows, fullname: windows-latest }
+            - { prettyname: macOS, fullname: macos-latest }
+            - { prettyname: Linux, fullname: ubuntu-latest }
+          threadingMode: ['SingleThread', 'MultiThreaded']
     timeout-minutes: 60
     steps:
       - name: Checkout
@@ -88,7 +88,7 @@ jobs:
         run: dotnet build -c Debug -warnaserror osu.Desktop.slnf
 
       - name: Test
-        run: dotnet test $pwd/**/*.Tests/bin/Debug/*/*.Tests.dll --logger "trx;LogFileName=TestResults-${{ matrix.os.prettyname }}-${{ matrix.threadingMode }}.trx" -- NUnit.ConsoleOut=0
+        run: dotnet test $pwd/**/*.Tests/bin/Debug/*/*.Tests.dll --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx" -- NUnit.ConsoleOut=0
         shell: pwsh
 
       # Attempt to upload results even if test fails.
@@ -97,8 +97,8 @@ jobs:
         uses: actions/upload-artifact@v3
         if: ${{ always() }}
         with:
-          name: osu-test-results-${{ matrix.os.prettyname }}-${{ matrix.threadingMode }}
-          path: ${{ github.workspace }}/TestResults/TestResults-${{ matrix.os.prettyname }}-${{ matrix.threadingMode }}.trx
+          name: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
+          path: ${{github.workspace}}/TestResults/TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx
 
   build-only-android:
     name: Build only (Android)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
@@ -2,11 +2,12 @@
 # Usage:
 #   !pp check 0        | Runs only the osu! ruleset.
 #   !pp check 0 2      | Runs only the osu! and catch rulesets.
+#
 
 name: Difficulty Calculation
 on:
   issue_comment:
-    types: [created]
+    types: [ created ]
 
 env:
   CONCURRENCY: 4
@@ -86,24 +87,24 @@ jobs:
       - name: Checkout osu (master)
         uses: actions/checkout@v3
         with:
-          path: "master/osu"
+          path: 'master/osu'
       - name: Checkout osu (pr)
         uses: actions/checkout@v3
         with:
-          path: "pr/osu"
+          path: 'pr/osu'
           repository: ${{ steps.upstreambranch.outputs.repo }}
           ref: ${{ steps.upstreambranch.outputs.branchname }}
 
       - name: Checkout osu-difficulty-calculator (master)
         uses: actions/checkout@v3
         with:
           repository: ppy/osu-difficulty-calculator
-          path: "master/osu-difficulty-calculator"
+          path: 'master/osu-difficulty-calculator'
       - name: Checkout osu-difficulty-calculator (pr)
         uses: actions/checkout@v3
         with:
           repository: ppy/osu-difficulty-calculator
-          path: "pr/osu-difficulty-calculator"
+          path: 'pr/osu-difficulty-calculator'
 
       - name: Install .NET 5.0.x
         uses: actions/setup-dotnet@v3

diff --git a/.github/workflows/report-nunit.yml b/.github/workflows/report-nunit.yml
@@ -2,7 +2,6 @@
 # See:
 #   * https://github.com/dorny/test-reporter#recommended-setup-for-public-repositories
 #   * https://docs.github.com/en/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token
-
 name: Annotate CI run with test results
 on:
   workflow_run:
@@ -19,21 +18,21 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion != 'cancelled' }}
     strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - { prettyname: Windows }
-          - { prettyname: macOS }
-          - { prettyname: Linux }
-        threadingMode: ["SingleThread", "MultiThreaded"]
+       fail-fast: false
+       matrix:
+          os:
+            - { prettyname: Windows }
+            - { prettyname: macOS }
+            - { prettyname: Linux }
+          threadingMode: ['SingleThread', 'MultiThreaded']
     timeout-minutes: 5
     steps:
       - name: Annotate CI run with test results
         uses: dorny/test-reporter@v1.6.0
         with:
-          artifact: osu-test-results-${{ matrix.os.prettyname }}-${{ matrix.threadingMode }}
-          name: Test Results (${{ matrix.os.prettyname }}, ${{ matrix.threadingMode }})
+          artifact: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
+          name: Test Results (${{matrix.os.prettyname}}, ${{matrix.threadingMode}})
           path: "*.trx"
           reporter: dotnet-trx
-          list-suites: "failed"
-          list-tests: "failed"
+          list-suites: 'failed'
+          list-tests: 'failed'
diff --git a/.github/workflows/sentry-release.yml b/.github/workflows/sentry-release.yml
@@ -3,7 +3,7 @@ name: Add Release to Sentry
 on:
   push:
     tags:
-      - "*"
+      - '*'
 
 permissions:
   contents: read # to fetch code (actions/checkout)
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Add Release to Sentry @@
     on:
       push:
         tags:
-          - "*"
+          - '*'
     permissions:
       contents: read # to fetch code (actions/checkout)
@@ Expand Down @@