Merge branch 'master' into hitposition

cdwcgt · Apr 6, 2024 · e487f20 · e487f20
2 parents 33ab00e + 93f1578
commit e487f20
Show file tree

Hide file tree

Showing 377 changed files with 8,685 additions and 2,818 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,10 +13,10 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Install .NET 8.0.x
- uses: actions/setup-dotnet@v3
+ uses: actions/setup-dotnet@v4
  with:
  dotnet-version: "8.0.x"
 
@@ -27,7 +27,7 @@ jobs:
  run: dotnet restore osu.Desktop.slnf
 
  - name: Restore inspectcode cache
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: ${{ github.workspace }}/inspectcode
  key: inspectcode-${{ hashFiles('.config/dotnet-tools.json', '.github/workflows/ci.yml', 'osu.sln*', 'osu*.slnf', '.editorconfig', '.globalconfig', 'CodeAnalysis/*', '**/*.csproj', '**/*.props') }}
@@ -70,10 +70,10 @@ jobs:
  timeout-minutes: 60
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Install .NET 8.0.x
- uses: actions/setup-dotnet@v3
+ uses: actions/setup-dotnet@v4
  with:
  dotnet-version: "8.0.x"
 
@@ -99,16 +99,16 @@ jobs:
  timeout-minutes: 60
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Setup JDK 11
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
  with:
  distribution: microsoft
  java-version: 11
 
  - name: Install .NET 8.0.x
- uses: actions/setup-dotnet@v3
+ uses: actions/setup-dotnet@v4
  with:
  dotnet-version: "8.0.x"
 
@@ -126,10 +126,10 @@ jobs:
  timeout-minutes: 60
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Install .NET 8.0.x
- uses: actions/setup-dotnet@v3
+ uses: actions/setup-dotnet@v4
  with:
  dotnet-version: "8.0.x"
 

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
@@ -110,10 +110,14 @@ jobs:
  if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.comment.body, '!diffcalc') }}
  steps:
  - name: Check permissions
- if: ${{ github.event_name != 'workflow_dispatch' }}
- uses: actions-cool/check-user-permission@a0668c9aec87f3875fc56170b6452a453e9dd819 # v2.2.0
- with:
- require: 'write'
+ run: |
+ ALLOWED_USERS=(smoogipoo peppy bdach)
+ for i in "${ALLOWED_USERS[@]}"; do
+ if [[ "${{ github.actor }}" == "$i" ]]; then
+ exit 0
+ fi
+ done
+ exit 1
 
  create-comment:
  name: Create PR comment
@@ -122,7 +126,7 @@ jobs:
  if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request }}
  steps:
  - name: Create comment
- uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
+ uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
  with:
  comment_tag: ${{ env.EXECUTION_ID }}
  message: |
@@ -140,7 +144,7 @@ jobs:
  GOOGLE_CREDS_FILE: ${{ steps.set-outputs.outputs.GOOGLE_CREDS_FILE }}
  steps:
  - name: Checkout diffcalc-sheet-generator
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  path: ${{ env.EXECUTION_ID }}
  repository: 'smoogipoo/diffcalc-sheet-generator'
@@ -249,7 +253,7 @@ jobs:
 
  - name: Restore cache
  id: restore-cache
- uses: maxnowack/local-cache@038cc090b52e4f205fbc468bf5b0756df6f68775 # v1
+ uses: maxnowack/local-cache@720e69c948191660a90aa1cf6a42fc4d2dacdf30 # v2
  with:
  path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
  key: ${{ steps.query.outputs.DATA_NAME }}
@@ -280,7 +284,7 @@ jobs:
 
  - name: Restore cache
  id: restore-cache
- uses: maxnowack/local-cache@038cc090b52e4f205fbc468bf5b0756df6f68775 # v1
+ uses: maxnowack/local-cache@720e69c948191660a90aa1cf6a42fc4d2dacdf30 # v2
  with:
  path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
  key: ${{ steps.query.outputs.DATA_NAME }}
@@ -354,7 +358,7 @@ jobs:
  steps:
  - name: Update comment on success
  if: ${{ needs.generator.result == 'success' }}
- uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
+ uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
  with:
  comment_tag: ${{ env.EXECUTION_ID }}
  mode: upsert
@@ -365,7 +369,7 @@ jobs:
 
  - name: Update comment on failure
  if: ${{ needs.generator.result == 'failure' }}
- uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
+ uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
  with:
  comment_tag: ${{ env.EXECUTION_ID }}
  mode: upsert
@@ -375,7 +379,7 @@ jobs:
 
  - name: Update comment on cancellation
  if: ${{ needs.generator.result == 'cancelled' }}
- uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
+ uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
  with:
  comment_tag: ${{ env.EXECUTION_ID }}
  mode: delete

diff --git a/.github/workflows/report-nunit.yml b/.github/workflows/report-nunit.yml
@@ -28,7 +28,7 @@ jobs:
  timeout-minutes: 5
  steps:
  - name: Annotate CI run with test results
- uses: dorny/test-reporter@v1.6.0
+ uses: dorny/test-reporter@v1.8.0
  with:
  artifact: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
  name: Test Results (${{matrix.os.prettyname}}, ${{matrix.threadingMode}})

diff --git a/.github/workflows/sentry-release.yml b/.github/workflows/sentry-release.yml
@@ -13,7 +13,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  fetch-depth: 0
 

diff --git a/.github/workflows/update-web-mod-definitions.yml b/.github/workflows/update-web-mod-definitions.yml
@@ -13,23 +13,23 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Install .NET 8.0.x
- uses: actions/setup-dotnet@v3
+ uses: actions/setup-dotnet@v4
  with:
  dotnet-version: "8.0.x"
 
  - name: Checkout ppy/osu
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  path: osu
 
  - name: Checkout ppy/osu-tools
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  repository: ppy/osu-tools
  path: osu-tools
 
  - name: Checkout ppy/osu-web
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  repository: ppy/osu-web
  path: osu-web
@@ -43,7 +43,7 @@ jobs:
  working-directory: ./osu-tools
 
  - name: Create pull request with changes
- uses: peter-evans/create-pull-request@v5
+ uses: peter-evans/create-pull-request@v6
  with:
  title: Update mod definitions
  body: "This PR has been auto-generated to update the mod definitions to match ppy/osu@${{ github.ref_name }}."

diff --git a/osu.Android.props b/osu.Android.props
@@ -10,7 +10,7 @@
  <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="ppy.osu.Framework.Android" Version="2024.217.0" />
+ <PackageReference Include="ppy.osu.Framework.Android" Version="2024.306.0" />
  </ItemGroup>
  <PropertyGroup>
  <!-- Fody does not handle Android build well, and warns when unchanged.