fixup! revert formatting changes

This commit is contained in:
Mohammed Keyvanzadeh 2023-03-27 18:37:01 +03:30
parent 3d032d0024
commit 433f9e5367
No known key found for this signature in database
GPG Key ID: 81F2B98B1104E76E
6 changed files with 85 additions and 84 deletions

View File

@ -1,11 +1,12 @@
blank_issues_enabled: false blank_issues_enabled: false
contact_links: contact_links:
- name: Help - name: Help
url: https://github.com/ppy/osu/discussions/categories/q-a 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! about: osu! not working as you'd expect? Not sure it's a bug? Check the Q&A section!
- name: Suggestions or feature request - name: Suggestions or feature request
url: https://github.com/ppy/osu/discussions/categories/ideas 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! about: Got something you think should change or be added? Search for or start a new discussion!
- name: osu!stable issues - name: osu!stable issues
url: https://github.com/ppy/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. 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.

View File

@ -1,46 +1,46 @@
version: 2 version: 2
updates: updates:
- package-ecosystem: nuget - package-ecosystem: nuget
directory: "/" directory: "/"
schedule: schedule:
interval: monthly interval: monthly
time: "17:00" time: "17:00"
open-pull-requests-limit: 0 # disabled until https://github.com/dependabot/dependabot-core/issues/369 is resolved. open-pull-requests-limit: 0 # disabled until https://github.com/dependabot/dependabot-core/issues/369 is resolved.
ignore: ignore:
- dependency-name: Microsoft.EntityFrameworkCore.Design - dependency-name: Microsoft.EntityFrameworkCore.Design
versions: versions:
- "> 2.2.6" - "> 2.2.6"
- dependency-name: Microsoft.EntityFrameworkCore.Sqlite - dependency-name: Microsoft.EntityFrameworkCore.Sqlite
versions: versions:
- "> 2.2.6" - "> 2.2.6"
- dependency-name: Microsoft.EntityFrameworkCore.Sqlite.Core - dependency-name: Microsoft.EntityFrameworkCore.Sqlite.Core
versions: versions:
- "> 2.2.6" - "> 2.2.6"
- dependency-name: Microsoft.Extensions.DependencyInjection - dependency-name: Microsoft.Extensions.DependencyInjection
versions: versions:
- ">= 5.a, < 6" - ">= 5.a, < 6"
- dependency-name: NUnit3TestAdapter - dependency-name: NUnit3TestAdapter
versions: versions:
- ">= 3.16.a, < 3.17" - ">= 3.16.a, < 3.17"
- dependency-name: Microsoft.NET.Test.Sdk - dependency-name: Microsoft.NET.Test.Sdk
versions: versions:
- 16.9.1 - 16.9.1
- dependency-name: Microsoft.Extensions.DependencyInjection - dependency-name: Microsoft.Extensions.DependencyInjection
versions: versions:
- 3.1.11 - 3.1.11
- 3.1.12 - 3.1.12
- dependency-name: Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson - dependency-name: Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
versions: versions:
- 3.1.11 - 3.1.11
- dependency-name: Microsoft.NETCore.Targets - dependency-name: Microsoft.NETCore.Targets
versions: versions:
- 5.0.0 - 5.0.0
- dependency-name: Microsoft.AspNetCore.SignalR.Protocols.MessagePack - dependency-name: Microsoft.AspNetCore.SignalR.Protocols.MessagePack
versions: versions:
- 5.0.2 - 5.0.2
- dependency-name: NUnit - dependency-name: NUnit
versions: versions:
- 3.13.1 - 3.13.1
- dependency-name: Microsoft.AspNetCore.SignalR.Client - dependency-name: Microsoft.AspNetCore.SignalR.Client
versions: versions:
- 3.1.11 - 3.1.11

View File

@ -59,21 +59,21 @@ jobs:
run: dotnet jb inspectcode $(pwd)/osu.Desktop.slnf --no-build --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN run: dotnet jb inspectcode $(pwd)/osu.Desktop.slnf --no-build --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN
- name: NVika - name: NVika
run: dotnet nvika parsereport "${{ github.workspace }}/inspectcodereport.xml" --treatwarningsaserrors run: dotnet nvika parsereport "${{github.workspace}}/inspectcodereport.xml" --treatwarningsaserrors
test: test:
name: Test name: Test
runs-on: ${{ matrix.os.fullname }} runs-on: ${{matrix.os.fullname}}
env: env:
OSU_EXECUTION_MODE: ${{ matrix.threadingMode }} OSU_EXECUTION_MODE: ${{matrix.threadingMode}}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: os:
- { prettyname: Windows, fullname: windows-latest } - { prettyname: Windows, fullname: windows-latest }
- { prettyname: macOS, fullname: macos-latest } - { prettyname: macOS, fullname: macos-latest }
- { prettyname: Linux, fullname: ubuntu-latest } - { prettyname: Linux, fullname: ubuntu-latest }
threadingMode: ["SingleThread", "MultiThreaded"] threadingMode: ['SingleThread', 'MultiThreaded']
timeout-minutes: 60 timeout-minutes: 60
steps: steps:
- name: Checkout - name: Checkout
@ -88,7 +88,7 @@ jobs:
run: dotnet build -c Debug -warnaserror osu.Desktop.slnf run: dotnet build -c Debug -warnaserror osu.Desktop.slnf
- name: Test - 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 shell: pwsh
# Attempt to upload results even if test fails. # Attempt to upload results even if test fails.
@ -97,8 +97,8 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
if: ${{ always() }} if: ${{ always() }}
with: with:
name: osu-test-results-${{ matrix.os.prettyname }}-${{ matrix.threadingMode }} name: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
path: ${{ github.workspace }}/TestResults/TestResults-${{ matrix.os.prettyname }}-${{ matrix.threadingMode }}.trx path: ${{github.workspace}}/TestResults/TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx
build-only-android: build-only-android:
name: Build only (Android) name: Build only (Android)

View File

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

View File

@ -2,7 +2,6 @@
# See: # See:
# * https://github.com/dorny/test-reporter#recommended-setup-for-public-repositories # * 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 # * https://docs.github.com/en/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token
name: Annotate CI run with test results name: Annotate CI run with test results
on: on:
workflow_run: workflow_run:
@ -19,21 +18,21 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion != 'cancelled' }} if: ${{ github.event.workflow_run.conclusion != 'cancelled' }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: os:
- { prettyname: Windows } - { prettyname: Windows }
- { prettyname: macOS } - { prettyname: macOS }
- { prettyname: Linux } - { prettyname: Linux }
threadingMode: ["SingleThread", "MultiThreaded"] threadingMode: ['SingleThread', 'MultiThreaded']
timeout-minutes: 5 timeout-minutes: 5
steps: steps:
- name: Annotate CI run with test results - name: Annotate CI run with test results
uses: dorny/test-reporter@v1.6.0 uses: dorny/test-reporter@v1.6.0
with: with:
artifact: osu-test-results-${{ matrix.os.prettyname }}-${{ matrix.threadingMode }} artifact: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
name: Test Results (${{ matrix.os.prettyname }}, ${{ matrix.threadingMode }}) name: Test Results (${{matrix.os.prettyname}}, ${{matrix.threadingMode}})
path: "*.trx" path: "*.trx"
reporter: dotnet-trx reporter: dotnet-trx
list-suites: "failed" list-suites: 'failed'
list-tests: "failed" list-tests: 'failed'

View File

@ -3,7 +3,7 @@ name: Add Release to Sentry
on: on:
push: push:
tags: tags:
- "*" - '*'
permissions: permissions:
contents: read # to fetch code (actions/checkout) contents: read # to fetch code (actions/checkout)