Merge branch 'master' into skin-name-author

.github/CODEOWNERS

@@ -1,4 +1,17 @@
-/news/                     @ppy/news-approval
-/wiki/Legal/**/en.md       @peppy @Ephemeralis
-/wiki/Legal/SCTL/          @peppy @Ephemeralis
-/wiki/Help_centre/**/en.md @peppy @Ephemeralis
+/.github/CODEOWNERS @peppy
+
+# News posts and assets
+/news/             @ppy/news-approval
+/wiki/shared/news/ @ppy/news-approval
+
+# Legal
+/wiki/Legal/**/en.md @peppy
+/wiki/Legal/SCTL/    @peppy
+
+# Help and rules
+/wiki/Help_centre/**/en.md @peppy
+/wiki/Rules/**/en.md       @peppy
+
+# Core team and developer info
+/wiki/People/Developers/en.md @peppy
+/wiki/People/osu!_team/en.md  @peppy

.github/workflows/continuous-integration.yml

@@ -10,53 +10,42 @@ on:
       - synchronize
       - edited
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   ci:
     name: changed files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: create master branch from remote master
         run: git branch master origin/master
 
-      - name: detect changed files
-        run: |
-          changed_files="$(mktemp)"
-          git diff --diff-filter=d --name-only --no-renames -z master >"$changed_files"
-          printf 'CHANGED_FILES=%s\n' "$changed_files" >>"$GITHUB_ENV"
-
-      - name: check file sizes
-        run: xargs -0r meta/check-file-sizes.sh <"$CHANGED_FILES"
-
       - name: set up Node.js
         id: setup-node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           cache: npm
           node-version: 20
 
       - name: load node_modules from cache
         id: cache-node-modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: node-modules-${{ hashFiles('package-lock.json') }}-${{ steps.setup-node.outputs.node-version }}
 
       - name: "if cache is outdated: install node.js dependencies"
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        if: ${{ steps.cache-node-modules.outputs.cache-hit != 'true' }}
         run: npm ci
 
-      - name: run remark on changed files
-        if: ${{ !contains(github.event.pull_request.body, 'SKIP_REMARK') }}
-        run: |
-          grep -z '\.md$' <"$CHANGED_FILES" | \
-          REPORTER=vfile-reporter-github-action xargs -0r meta/remark.sh
-
       - name: set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           cache: pip
           cache-dependency-path: requirements.txt
@@ -65,13 +54,34 @@ jobs:
       - name: set up Python CI dependencies
         run: pip install -r requirements.txt
 
+      - name: detect changed files
+        id: detect-changed-files
+        run: |
+          changed_files="$(mktemp)"
+          git diff --diff-filter=d --name-only --no-renames -z master >"$changed_files"
+          printf 'CHANGED_FILES=%s\n' "$changed_files" >>"$GITHUB_ENV"
+
+      - name: check file sizes
+        if: ${{ !cancelled() && steps.detect-changed-files.outcome == 'success' }}
+        run: xargs -0r meta/check-file-sizes.sh <"$CHANGED_FILES"
+
+      - name: run remark on changed files
+        if: ${{ !cancelled() && steps.detect-changed-files.outcome == 'success' }}
+        continue-on-error: ${{ contains(github.event.pull_request.body, 'SKIP_REMARK') }}
+        run: |
+          grep -z '\.md$' <"$CHANGED_FILES" | \
+          REPORTER=vfile-reporter-github-action xargs -0r meta/remark.sh
+
       - name: run yamllint on .yaml and .md files
+        if: ${{ !cancelled() && steps.detect-changed-files.outcome == 'success' }}
         run: osu-wiki-tools check-yaml
 
       - name: find broken wikilinks
-        if: ${{ !contains(github.event.pull_request.body, 'SKIP_WIKILINK_CHECK') }}
+        if: ${{ !cancelled() && steps.detect-changed-files.outcome == 'success' }}
+        continue-on-error: ${{ contains(github.event.pull_request.body, 'SKIP_WIKILINK_CHECK') }}
         run: osu-wiki-tools check-links --all
 
       - name: check if translations are marked as outdated
-        if: ${{ !contains(github.event.pull_request.body, 'SKIP_OUTDATED_CHECK') }}
+        if: ${{ !cancelled() && steps.detect-changed-files.outcome == 'success' }}
+        continue-on-error: ${{ contains(github.event.pull_request.body, 'SKIP_OUTDATED_CHECK') }}
         run: osu-wiki-tools check-outdated-articles --no-recommend-autofix

.github/workflows/refresh-cache.yml

@@ -5,38 +5,42 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
   cache-node-modules:
     name: update cache
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # meta/remark contains linked packages
           sparse-checkout: meta/remark
 
       - name: set up Node.js
         id: setup-node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           cache: npm
           node-version: 20
 
       - name: check node_modules cache
         id: cache-node-modules
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: node_modules
           lookup-only: true
           key: node-modules-${{ hashFiles('package-lock.json') }}-${{ steps.setup-node.outputs.node-version }}
 
       - name: "if cache is outdated: install node_modules"
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        if: ${{ steps.cache-node-modules.outputs.cache-hit != 'true' }}
         run: npm ci
 
       - name: "if cache is outdated: save cache"
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v3
+        if: ${{ steps.cache-node-modules.outputs.cache-hit != 'true' }}
+        uses: actions/cache/save@v4
         with:
           path: node_modules
           key: node-modules-${{ hashFiles('package-lock.json') }}-${{ steps.setup-node.outputs.node-version }}

.remarkrc.js

@@ -43,6 +43,7 @@ export default {
     ['lint-table-cell-padding', false],
     ['lint-table-pipe-alignment', false],
     ['message-control', { name: 'lint', source: ['remark-lint', 'remark-lint-osu'] }],
+    ['osu/lint-country-flags'],
     ['osu/lint-table-align-style'],
     ['osu/lint-table-cell-padding'],
     ['osu/lint-table-no-missing-cells'],

meta/group-info/zh.yaml

@@ -1,6 +1,3 @@
-outdated_since: a8383bfa1e96690b7f254a39672b15781e148634
-outdated_translation: true
-
 separator: ，
 alumni:
   roles:
@@ -17,6 +14,7 @@ gmt:
     beatmap: 谱面管理员
     chat: 聊天管理员
     forum: 论坛管理员
+    general: 全局管理员
     team: 官方团队
     dev: osu! 贡献者
     player: 玩家支持团队

news/2024/2024-03-20-bespoke-music-in-osu.md

@@ -30,7 +30,7 @@ It means that osu! originals don't only refer to songs commissioned by the osu!
 
 ![](/wiki/shared/news/2024-03-20-bespoke-music-in-osu/fa-listing-original-label.png)
 
-You can peruse all of the **478 osu! originals** over in the [osu! originals wiki article](/wiki/osu!_originals). If you're an artist or event organiser and don't see your songs in there, please [reach](/wiki/Community/osu!_Discord_server) [out](https://osu.ppy.sh/users/5773079)!
+You can peruse all of the **478 osu! originals** over in the [osu! originals wiki article](/wiki/osu!_originals). If you're an artist or event organiser and don't see your songs in there, please [reach](/wiki/Community/Discord_servers#official) [out](https://osu.ppy.sh/users/5773079)!
 
 ## osu! World Cups
 

news/2024/2024-04-18-osu-catch-world-cup-2024-registrations-now-open.md

@@ -28,7 +28,7 @@ Refer to the **[osu!catch World Cup 2024 wiki article](/wiki/Tournaments/CWC/202
 
 ## Prizes
 
-The osu!catch World Cup 2024 offers a $2,000 prize pool, along with limited-edition merch!
+The osu!catch World Cup 2024 offers a $2,534.24 prize pool, along with limited-edition merch!
 
 - **1st:** 50% of the prize pool, single-run merch, profile badge, **osu!catch Champion** user title for one year
 - **2nd:** 30% of the prize pool, single-run merch, profile badge