From 000b85a860cb4e6f2f8cf12884fdf85adf1799aa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Sep 2021 17:56:56 +0900
Subject: [PATCH 01/13] Add GH Actions workflow for diffcalc checks

---
 .github/workflows/test-diffcalc.yml | 150 ++++++++++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 .github/workflows/test-diffcalc.yml

diff --git a/.github/workflows/test-diffcalc.yml b/.github/workflows/test-diffcalc.yml
new file mode 100644
index 0000000000..b703c97735
--- /dev/null
+++ b/.github/workflows/test-diffcalc.yml
@@ -0,0 +1,150 @@
+name: Diffcalc Consistency Checks
+on:
+  issue_comment:
+    types: [ created ]
+
+env:
+  DB_USER: root
+  DB_HOST: 127.0.0.1
+  CONCURRENCY: 4
+  ALLOW_DOWNLOAD: 1
+  SAVE_DOWNLOADED: 1
+
+jobs:
+  diffcalc:
+    name: Diffcalc
+    runs-on: ubuntu-latest
+
+    if: |
+      contains(github.event.comment.html_url, '/pull/') &&
+      contains(github.event.comment.body, '!pp check') &&
+      ${{ github.event.comment.author_association == 'MEMBER' }}
+
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruleset:
+          - { name: osu, id: 0 }
+          - { name: taiko, id: 1 }
+          - { name: catch, id: 2 }
+          - { name: mania, id: 3 }
+
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    steps:
+      - name: Verify MySQL connection from host
+        run: |
+          sudo apt-get install -y mysql-client
+          mysql --host ${{ env.DB_HOST }} -u${{ env.DB_USER }} -e "SHOW DATABASES"
+
+      - name: Create directory structure
+        run: |
+          mkdir -p $GITHUB_WORKSPACE/master/
+          mkdir -p $GITHUB_WORKSPACE/pr/
+
+      # Checkout osu
+      - name: Checkout osu (master)
+        uses: actions/checkout@v2
+        with:
+          repository: ppy/osu
+          path: 'master/osu'
+      - name: Checkout osu (pr)
+        uses: actions/checkout@v2
+        with:
+          path: 'pr/osu'
+
+      # Checkout osu-difficulty-calculator
+      - name: Checkout osu-difficulty-calculator (master)
+        uses: actions/checkout@v2
+        with:
+          repository: ppy/osu-difficulty-calculator
+          path: 'master/osu-difficulty-calculator'
+      - name: Checkout osu-difficulty-calculator (pr)
+        uses: actions/checkout@v2
+        with:
+          repository: ppy/osu-difficulty-calculator
+          path: 'pr/osu-difficulty-calculator'
+
+      - name: Install .NET 5.0.x
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "5.0.x"
+
+      # Sanity checks to make sure diffcalc is not run when incompatible.
+      - name: Build diffcalc (master)
+        run: |
+          cd $GITHUB_WORKSPACE/master/osu-difficulty-calculator
+          ./UseLocalOsu.sh
+          dotnet build
+      - name: Build diffcalc (pr)
+        run: |
+          cd $GITHUB_WORKSPACE/pr/osu-difficulty-calculator
+          ./UseLocalOsu.sh
+          dotnet build
+
+      # Initial data imports
+      - name: Download + import data
+        run: |
+          PERFORMANCE_DATA_NAME=$(date +'%Y_%m_01_performance_${{ matrix.ruleset.name }}_random')
+          BEATMAPS_DATA_NAME=$(date +'%Y_%m_01_osu_files')
+
+          # Set env variable for further steps.
+          echo "BEATMAPS_PATH=$GITHUB_WORKSPACE/$BEATMAPS_DATA_NAME" >> $GITHUB_ENV
+
+          cd $GITHUB_WORKSPACE
+
+          wget https://data.ppy.sh/$PERFORMANCE_DATA_NAME.tar.bz2
+          wget https://data.ppy.sh/$BEATMAPS_DATA_NAME.tar.bz2
+          tar -xf $PERFORMANCE_DATA_NAME.tar.bz2
+          tar -xf $BEATMAPS_DATA_NAME.tar.bz2
+
+          cd $GITHUB_WORKSPACE/$PERFORMANCE_DATA_NAME
+
+          mysql --host ${{ env.DB_HOST }} -u${{ env.DB_USER }} -e "CREATE DATABASE osu_master"
+          mysql --host ${{ env.DB_HOST }} -u${{ env.DB_USER }} -e "CREATE DATABASE osu_pr"
+
+          cat *.sql | mysql --host ${{ env.DB_HOST }} -u${{ env.DB_USER }} --database=osu_master
+          cat *.sql | mysql --host ${{ env.DB_HOST }} -u${{ env.DB_USER }} --database=osu_pr
+
+      # Run diffcalc
+      - name: Run diffcalc (master)
+        env:
+          DB_NAME: osu_master
+        run: |
+          cd $GITHUB_WORKSPACE/master/osu-difficulty-calculator/osu.Server.DifficultyCalculator
+          dotnet run -c:Release -- all -m ${{ matrix.ruleset.id }} -ac -c ${{ env.CONCURRENCY }}
+      - name: Run diffcalc (pr)
+        env:
+          DB_NAME: osu_pr
+        run: |
+          cd $GITHUB_WORKSPACE/pr/osu-difficulty-calculator/osu.Server.DifficultyCalculator
+          dotnet run -c:Release -- all -m ${{ matrix.ruleset.id }} -ac -c ${{ env.CONCURRENCY }}
+
+      # Print diffs
+      - name: Print diffs
+        run: |
+          mysql --host ${{ env.DB_HOST }} -u${{ env.DB_USER }} -e "
+            SELECT
+              m.beatmap_id,
+              m.mods,
+              m.diff_unified as `sr_master`,
+              p.diff_unified as `sr_pr`,
+              (p.diff_unified - m.diff_unified) as `diff`
+            FROM osu_master.osu_beatmap_difficulty m
+            JOIN osu_pr.osu_beatmap_difficulty p
+              ON m.beatmap_id = p.beatmap_id
+              AND m.mode = p.mode
+              AND m.mods = p.mods
+            WHERE abs(m.diff_unified - p.diff_unified) > 0.1
+            ORDER BY abs(m.diff_unified - p.diff_unified)
+              DESC;"
+
+      # Todo: Run ppcalc
\ No newline at end of file

From 176c414c112e1321a65fde03b78ecf72a479285a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Sep 2021 18:10:16 +0900
Subject: [PATCH 02/13] More accurate data retrieval

---
 .github/workflows/test-diffcalc.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-diffcalc.yml b/.github/workflows/test-diffcalc.yml
index b703c97735..3d80f08ebf 100644
--- a/.github/workflows/test-diffcalc.yml
+++ b/.github/workflows/test-diffcalc.yml
@@ -93,8 +93,8 @@ jobs:
       # Initial data imports
       - name: Download + import data
         run: |
-          PERFORMANCE_DATA_NAME=$(date +'%Y_%m_01_performance_${{ matrix.ruleset.name }}_random')
-          BEATMAPS_DATA_NAME=$(date +'%Y_%m_01_osu_files')
+          PERFORMANCE_DATA_NAME=$(curl https://data.ppy.sh/ | grep performance_${{ matrix.ruleset.name }}_random | tail -1 | awk -F "\"" '{print $2}' | sed 's/\.tar\.bz2//g')
+          BEATMAPS_DATA_NAME=$(curl https://data.ppy.sh/ | grep osu_files | tail -1 | awk -F "\"" '{print $2}' | sed 's/\.tar\.bz2//g')
 
           # Set env variable for further steps.
           echo "BEATMAPS_PATH=$GITHUB_WORKSPACE/$BEATMAPS_DATA_NAME" >> $GITHUB_ENV

From b8ada31d7de0b4fa47abd50a84d83a67e409eec5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Sep 2021 18:47:15 +0900
Subject: [PATCH 03/13] Match against individual rulesets

---
 .github/workflows/test-diffcalc.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-diffcalc.yml b/.github/workflows/test-diffcalc.yml
index 3d80f08ebf..48e1e238c1 100644
--- a/.github/workflows/test-diffcalc.yml
+++ b/.github/workflows/test-diffcalc.yml
@@ -1,3 +1,8 @@
+# Listens to new PR comments containing "!pp check", and runs diffcalc across the PR and master to produce a table of differences.
+# Usage:
+# !pp check 0     : Runs only the osu! ruleset
+# !pp check 0 1   : Runs the osu! and taiko rulesets.
+
 name: Diffcalc Consistency Checks
 on:
   issue_comment:
@@ -18,8 +23,8 @@ jobs:
     if: |
       contains(github.event.comment.html_url, '/pull/') &&
       contains(github.event.comment.body, '!pp check') &&
-      ${{ github.event.comment.author_association == 'MEMBER' }}
-
+      ${{ github.event.comment.author_association == 'MEMBER' }} &&
+      contains(github.event.comment.body, ${{ matrix.ruleset.id }})
 
     strategy:
       fail-fast: false

From 789c108e8d426fba356d4f424427f558c2b19ec8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Sep 2021 18:56:56 +0900
Subject: [PATCH 04/13] Fix if condition

---
 .github/workflows/test-diffcalc.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-diffcalc.yml b/.github/workflows/test-diffcalc.yml
index 48e1e238c1..64ffa84c5e 100644
--- a/.github/workflows/test-diffcalc.yml
+++ b/.github/workflows/test-diffcalc.yml
@@ -23,8 +23,7 @@ jobs:
     if: |
       contains(github.event.comment.html_url, '/pull/') &&
       contains(github.event.comment.body, '!pp check') &&
-      ${{ github.event.comment.author_association == 'MEMBER' }} &&
-      contains(github.event.comment.body, ${{ matrix.ruleset.id }})
+      ${{ github.event.comment.author_association == 'MEMBER' }}
 
     strategy:
       fail-fast: false
@@ -34,6 +33,10 @@ jobs:
           - { name: taiko, id: 1 }
           - { name: catch, id: 2 }
           - { name: mania, id: 3 }
+        isValidRuleset:
+          - contains(github.event.comment.body, ${{ matrix.ruleset.id }})
+        exclude:
+          - isValidRuleset: false
 
     services:
       mysql:

From 33dcb4915b28e36e354151eb8e7ee929695bddd7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Sep 2021 19:12:41 +0900
Subject: [PATCH 05/13] Revert "Fix if condition"

This reverts commit 789c108e8d426fba356d4f424427f558c2b19ec8.
---
 .github/workflows/test-diffcalc.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-diffcalc.yml b/.github/workflows/test-diffcalc.yml
index 64ffa84c5e..48e1e238c1 100644
--- a/.github/workflows/test-diffcalc.yml
+++ b/.github/workflows/test-diffcalc.yml
@@ -23,7 +23,8 @@ jobs:
     if: |
       contains(github.event.comment.html_url, '/pull/') &&
       contains(github.event.comment.body, '!pp check') &&
-      ${{ github.event.comment.author_association == 'MEMBER' }}
+      ${{ github.event.comment.author_association == 'MEMBER' }} &&
+      contains(github.event.comment.body, ${{ matrix.ruleset.id }})
 
     strategy:
       fail-fast: false
@@ -33,10 +34,6 @@ jobs:
           - { name: taiko, id: 1 }
           - { name: catch, id: 2 }
           - { name: mania, id: 3 }
-        isValidRuleset:
-          - contains(github.event.comment.body, ${{ matrix.ruleset.id }})
-        exclude:
-          - isValidRuleset: false
 
     services:
       mysql:

From 54389561aaefd5b1f69f1aa5b360260ba1328676 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Sep 2021 19:12:55 +0900
Subject: [PATCH 06/13] Revert "Match against individual rulesets"

This reverts commit b8ada31d7de0b4fa47abd50a84d83a67e409eec5.
---
 .github/workflows/test-diffcalc.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-diffcalc.yml b/.github/workflows/test-diffcalc.yml
index 48e1e238c1..3d80f08ebf 100644
--- a/.github/workflows/test-diffcalc.yml
+++ b/.github/workflows/test-diffcalc.yml
@@ -1,8 +1,3 @@
-# Listens to new PR comments containing "!pp check", and runs diffcalc across the PR and master to produce a table of differences.
-# Usage:
-# !pp check 0     : Runs only the osu! ruleset
-# !pp check 0 1   : Runs the osu! and taiko rulesets.
-
 name: Diffcalc Consistency Checks
 on:
   issue_comment:
@@ -23,8 +18,8 @@ jobs:
     if: |
       contains(github.event.comment.html_url, '/pull/') &&
       contains(github.event.comment.body, '!pp check') &&
-      ${{ github.event.comment.author_association == 'MEMBER' }} &&
-      contains(github.event.comment.body, ${{ matrix.ruleset.id }})
+      ${{ github.event.comment.author_association == 'MEMBER' }}
+
 
     strategy:
       fail-fast: false

From 893a4d43657ab4d335d951cee8e22708d00e09b4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Sep 2021 19:23:55 +0900
Subject: [PATCH 07/13] Fix incorrect quoting

---
 .github/workflows/test-diffcalc.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-diffcalc.yml b/.github/workflows/test-diffcalc.yml
index 3d80f08ebf..1e5c033a67 100644
--- a/.github/workflows/test-diffcalc.yml
+++ b/.github/workflows/test-diffcalc.yml
@@ -135,9 +135,9 @@ jobs:
             SELECT
               m.beatmap_id,
               m.mods,
-              m.diff_unified as `sr_master`,
-              p.diff_unified as `sr_pr`,
-              (p.diff_unified - m.diff_unified) as `diff`
+              m.diff_unified as 'sr_master',
+              p.diff_unified as 'sr_pr',
+              (p.diff_unified - m.diff_unified) as 'diff'
             FROM osu_master.osu_beatmap_difficulty m
             JOIN osu_pr.osu_beatmap_difficulty p
               ON m.beatmap_id = p.beatmap_id

From c6d71e1ae8bb7d3862abd063db7e285f311e4d2d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Sep 2021 20:10:17 +0900
Subject: [PATCH 08/13] Add back ruleset check

---
 .github/workflows/test-diffcalc.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-diffcalc.yml b/.github/workflows/test-diffcalc.yml
index 1e5c033a67..ab7107f594 100644
--- a/.github/workflows/test-diffcalc.yml
+++ b/.github/workflows/test-diffcalc.yml
@@ -20,7 +20,6 @@ jobs:
       contains(github.event.comment.body, '!pp check') &&
       ${{ github.event.comment.author_association == 'MEMBER' }}
 
-
     strategy:
       fail-fast: false
       matrix:
@@ -40,6 +39,12 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
+      - name: Verify ruleset
+        if: contains(github.event.comment.body, matrix.ruleset.id) == false
+        run: |
+          echo "${{ github.event.comment.body }} doesn't contain ${{ matrix.ruleset.id }}"
+          exit 1
+
       - name: Verify MySQL connection from host
         run: |
           sudo apt-get install -y mysql-client

From 1f7f8bb18992d1a8a558eb432acdc1a7e55e30ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Sep 2021 20:13:33 +0900
Subject: [PATCH 09/13] Add description to workflow

---
 .github/workflows/test-diffcalc.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/test-diffcalc.yml b/.github/workflows/test-diffcalc.yml
index ab7107f594..c6b2f254c8 100644
--- a/.github/workflows/test-diffcalc.yml
+++ b/.github/workflows/test-diffcalc.yml
@@ -1,3 +1,9 @@
+# Listens for new PR comments containing !pp check [id], and runs a diffcalc comparison against master.
+# Usage:
+#   !pp check 0        | Runs only the osu! ruleset.
+#   !pp check 0 2      | Runs only the osu! and catch rulesets.
+#
+
 name: Diffcalc Consistency Checks
 on:
   issue_comment:

From 88158b79f8e5ad2154fa1efd0f89e10532421600 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Sep 2021 20:37:38 +0900
Subject: [PATCH 10/13] Change to using top scores

---
 .github/workflows/test-diffcalc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-diffcalc.yml b/.github/workflows/test-diffcalc.yml
index c6b2f254c8..3bec11928f 100644
--- a/.github/workflows/test-diffcalc.yml
+++ b/.github/workflows/test-diffcalc.yml
@@ -104,7 +104,7 @@ jobs:
       # Initial data imports
       - name: Download + import data
         run: |
-          PERFORMANCE_DATA_NAME=$(curl https://data.ppy.sh/ | grep performance_${{ matrix.ruleset.name }}_random | tail -1 | awk -F "\"" '{print $2}' | sed 's/\.tar\.bz2//g')
+          PERFORMANCE_DATA_NAME=$(curl https://data.ppy.sh/ | grep performance_${{ matrix.ruleset.name }}_top | tail -1 | awk -F "\"" '{print $2}' | sed 's/\.tar\.bz2//g')
           BEATMAPS_DATA_NAME=$(curl https://data.ppy.sh/ | grep osu_files | tail -1 | awk -F "\"" '{print $2}' | sed 's/\.tar\.bz2//g')
 
           # Set env variable for further steps.

From 62d65f81fb785ae4656b312f6617f469401349d6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 6 Sep 2021 16:53:09 +0900
Subject: [PATCH 11/13] Limit at 10000 entries

---
 .github/workflows/test-diffcalc.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-diffcalc.yml b/.github/workflows/test-diffcalc.yml
index 3bec11928f..d963e49d9f 100644
--- a/.github/workflows/test-diffcalc.yml
+++ b/.github/workflows/test-diffcalc.yml
@@ -156,6 +156,7 @@ jobs:
               AND m.mods = p.mods
             WHERE abs(m.diff_unified - p.diff_unified) > 0.1
             ORDER BY abs(m.diff_unified - p.diff_unified)
-              DESC;"
+              DESC
+            LIMIT 10000;"
 
       # Todo: Run ppcalc
\ No newline at end of file

From 61f819b66d16f0d65a14f767cd66d70d13379f00 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Sep 2021 15:51:57 +0900
Subject: [PATCH 12/13] Add COE and better PR condition

---
 .github/workflows/test-diffcalc.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-diffcalc.yml b/.github/workflows/test-diffcalc.yml
index d963e49d9f..efa36712be 100644
--- a/.github/workflows/test-diffcalc.yml
+++ b/.github/workflows/test-diffcalc.yml
@@ -22,12 +22,13 @@ jobs:
     runs-on: ubuntu-latest
 
     if: |
-      contains(github.event.comment.html_url, '/pull/') &&
+      ${{ github.event.issue.pull_request }} &&
       contains(github.event.comment.body, '!pp check') &&
       ${{ github.event.comment.author_association == 'MEMBER' }}
 
     strategy:
       fail-fast: false
+      continue-on-error: true
       matrix:
         ruleset:
           - { name: osu, id: 0 }

From 842696c388a6b2d1401b4a41fbe1d39af53491d1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Sep 2021 15:54:58 +0900
Subject: [PATCH 13/13] Fix incorrect definition

---
 .github/workflows/test-diffcalc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-diffcalc.yml b/.github/workflows/test-diffcalc.yml
index efa36712be..7728d91152 100644
--- a/.github/workflows/test-diffcalc.yml
+++ b/.github/workflows/test-diffcalc.yml
@@ -20,6 +20,7 @@ jobs:
   diffcalc:
     name: Diffcalc
     runs-on: ubuntu-latest
+    continue-on-error: true
 
     if: |
       ${{ github.event.issue.pull_request }} &&
@@ -28,7 +29,6 @@ jobs:
 
     strategy:
       fail-fast: false
-      continue-on-error: true
       matrix:
         ruleset:
           - { name: osu, id: 0 }