From 27b5ecb0892fade9dcdade5c29de8cb17136dcdd Mon Sep 17 00:00:00 2001
From: Hsiao-nan Cheung <niheaven@gmail.com>
Date: Sun, 26 Dec 2021 23:09:37 +0800
Subject: [PATCH] mariadb, redis: Fix manifests and update (#2961)

* forego: Deprecate manifest

* mariadb: Fix checkver and update to 10.6.5

* redis: Move `redis5` to `redis`

* Use JSONPath in mariadb

Signed-off-by: Hsiao-nan Cheung <niheaven@gmail.com>

* Fix whitespaces

* trigger CI

Co-authored-by: Rashil Gandhi <rashil2000@gmail.com>
---
 bucket/mariadb.json                | 18 +++++++++---------
 bucket/redis.json                  | 21 ++++++++++++++++-----
 bucket/redis5.json                 | 28 ----------------------------
 {bucket => deprecated}/forego.json |  0
 4 files changed, 25 insertions(+), 42 deletions(-)
 delete mode 100644 bucket/redis5.json
 rename {bucket => deprecated}/forego.json (100%)

diff --git a/bucket/mariadb.json b/bucket/mariadb.json
index ee8c12fca8..62c864ab60 100644
--- a/bucket/mariadb.json
+++ b/bucket/mariadb.json
@@ -1,5 +1,5 @@
 {
-    "version": "10.6.4",
+    "version": "10.6.5",
     "description": "Community developed fork of MySQL server.",
     "homepage": "https://mariadb.org",
     "license": "GPL-2.0-only",
@@ -13,14 +13,14 @@
     ],
     "architecture": {
         "64bit": {
-            "url": "https://downloads.mariadb.com/MariaDB/mariadb-10.6.4/winx64-packages/mariadb-10.6.4-winx64.zip",
-            "hash": "25440575882fbe54a442c5fb8a7c76b70588e03a4be093dfb1694cad8fbdfdd7",
-            "extract_dir": "mariadb-10.6.4-winx64"
+            "url": "https://downloads.mariadb.com/MariaDB/mariadb-10.6.5/winx64-packages/mariadb-10.6.5-winx64.zip",
+            "hash": "ca56070e4d099c412987f09b73755fe874b83f951facd0fa81b8f76463569a3b",
+            "extract_dir": "mariadb-10.6.5-winx64"
         },
         "32bit": {
-            "url": "https://downloads.mariadb.com/MariaDB/mariadb-10.6.4/win32-packages/mariadb-10.6.4-win32.zip",
-            "hash": "1a2431b9d962ccc641fe76214a869e46e435f38be4ddd862cebdb0bd8a11ff47",
-            "extract_dir": "mariadb-10.6.4-win32"
+            "url": "https://downloads.mariadb.com/MariaDB/mariadb-10.6.5/win32-packages/mariadb-10.6.5-win32.zip",
+            "hash": "e1c9f7aa9c8d1eefceae837ed794a1d6fa596bb86b82024e5fd187b33030fa23",
+            "extract_dir": "mariadb-10.6.5-win32"
         }
     },
     "post_install": [
@@ -59,8 +59,8 @@
     ],
     "persist": "data",
     "checkver": {
-        "url": "https://downloads.mariadb.org/",
-        "regex": "Download ([\\d.]+) Stable"
+        "url": "https://downloads.mariadb.org/rest-api/mariadb/all-releases/",
+        "jsonpath": "$.releases[?(@.status=='stable')].release_number"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/redis.json b/bucket/redis.json
index 895266e402..dea28c8b07 100644
--- a/bucket/redis.json
+++ b/bucket/redis.json
@@ -1,18 +1,29 @@
 {
-    "version": "3.2.100",
+    "version": "5.0.14",
     "description": "In-memory data structure store, used as a database, cache and message broker.",
     "homepage": "https://redis.io",
     "license": "BSD-3-Clause",
-    "url": "https://github.com/MicrosoftArchive/redis/releases/download/win-3.2.100/Redis-x64-3.2.100.zip",
-    "hash": "73775183186ebd1917353a8ae62303a328cedfff58164c9bf46e2b46977a9475",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/tporadowski/redis/releases/download/v5.0.14/Redis-x64-5.0.14.zip",
+            "hash": "858be95d18021e350f28a8d24ab5139fcc856f7667f85e4f114ff7b30082e48e"
+        }
+    },
     "bin": [
         "redis-benchmark.exe",
         "redis-check-aof.exe",
+        "redis-check-rdb.exe",
         "redis-cli.exe",
         "redis-server.exe"
     ],
     "checkver": {
-        "url": "https://github.com/MicrosoftArchive/redis/releases/",
-        "regex": ">win-([\\d.]+)<"
+        "github": "https://github.com/tporadowski/redis"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/tporadowski/redis/releases/download/v$version/Redis-x64-$version.zip"
+            }
+        }
     }
 }
diff --git a/bucket/redis5.json b/bucket/redis5.json
deleted file mode 100644
index 12344719ed..0000000000
--- a/bucket/redis5.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "version": "5.0.14",
-    "description": "In-memory data structure store, used as a database, cache and message broker.",
-    "homepage": "https://redis.io",
-    "license": "BSD-3-Clause",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/tporadowski/redis/releases/download/v5.0.14/Redis-x64-5.0.14.zip",
-            "hash": "858be95d18021e350f28a8d24ab5139fcc856f7667f85e4f114ff7b30082e48e"
-        }
-    },
-    "bin": [
-        "redis-benchmark.exe",
-        "redis-check-aof.exe",
-        "redis-cli.exe",
-        "redis-server.exe"
-    ],
-    "checkver": {
-        "github": "https://github.com/tporadowski/redis"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/tporadowski/redis/releases/download/v$version/Redis-x64-$version.zip"
-            }
-        }
-    }
-}
diff --git a/bucket/forego.json b/deprecated/forego.json
similarity index 100%
rename from bucket/forego.json
rename to deprecated/forego.json