Merge remote-tracking branch 'remotes/origin/master' into mysql-8.4.3

# Conflicts: # README.md
hemnstill · Sep 6, 2024 · 147bd20 · 147bd20
2 parents 260ce61 + 6303384
commit 147bd20
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml
@@ -47,7 +47,7 @@ jobs:
     uses: ./.github/workflows/release.yml
     with:
       workflow: ${{ github.workflow }}
-      tool_version: '7.2.4'
+      tool_version: '7.2.5'
       prepare_body: |
         bsdtar -Oxf ./build-musl/build-musl.tar.gz build-musl.md >> body.md
         bsdtar -Oxf ./build-msys2/build-msys2.tar.gz build-msys2.md >> body.md

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/zstd-1.5.6/total?label=⭳%20zstd-1.5.6)](https://github.com/hemnstill/StandaloneTools/releases/tag/zstd-1.5.6)                                        | [![GitHub Repo stars](https://img.shields.io/github/stars/facebook/zstd?style=social&label=zstd)](https://github.com/facebook/zstd) [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/facebook/zstd)](https://github.com/facebook/zstd/releases/latest)                                                                                                                                                                                                                                                                                                                   |
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/pg_dump-15.1/total?label=⭳%20pg_dump-15.1)](https://github.com/hemnstill/StandaloneTools/releases/tag/pg_dump-15.1)                                  | [![GitHub Repo stars](https://img.shields.io/github/stars/postgres/postgres?style=social&label=postgres)](https://github.com/postgres/postgres) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/postgres/postgres)](https://www.postgresql.org/docs/current/index.html)                                                                                                                                                                                                                                                                                                                                 |
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/mysql-8.4.2/total?label=⭳%20mysql-8.4.2)](https://github.com/hemnstill/StandaloneTools/releases/tag/mysql-8.4.2)                                     | [![GitHub Repo stars](https://img.shields.io/github/stars/mysql/mysql-server?style=social&label=mysql-server)](https://github.com/mysql/mysql-server) [![latest packaged version(s)](https://repology.org/badge/latest-versions/mysql.svg)](https://repology.org/project/mysql/information)                                                                                                                                                                                                                                                                                                                                |
-| [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/redis-7.2.4/total?label=⭳%20redis-7.2.4)](https://github.com/hemnstill/StandaloneTools/releases/tag/redis-7.2.4)                                     | [![GitHub Repo stars](https://img.shields.io/github/stars/redis/redis?style=social&label=redis)](https://github.com/redis/redis) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/redis/redis)](https://redis.io/download/)                                                                                                                                                                                                                                                                                                                                                                              |
+| [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/redis-7.2.5/total?label=⭳%20redis-7.2.5)](https://github.com/hemnstill/StandaloneTools/releases/tag/redis-7.2.5)                                     | [![GitHub Repo stars](https://img.shields.io/github/stars/redis/redis?style=social&label=redis)](https://github.com/redis/redis) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/redis/redis)](https://redis.io/download/)                                                                                                                                                                                                                                                                                                                                                                              |
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/busybox-1.37.0-FRP-5398/total?label=⭳%20busybox-1.37.0-FRP-5398)](https://github.com/hemnstill/StandaloneTools/releases/tag/busybox-1.37.0-FRP-5398) | [![GitHub Repo stars](https://img.shields.io/github/stars/rmyorston/busybox-w32?style=social&label=busybox-w32)](https://github.com/rmyorston/busybox-w32) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/rmyorston/busybox-w32)](https://frippery.org/busybox/release-notes/current.html) [![latest packaged version(s)](https://repology.org/badge/latest-versions/busybox.svg)](https://repology.org/project/busybox/information)                                                                                                                                                                   |
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/far2l-2.6.3/total?label=⭳%20far2l-2.6.3)](https://github.com/hemnstill/StandaloneTools/releases/tag/far2l-2.6.3)                                     | [![GitHub Repo stars](https://img.shields.io/github/stars/elfmz/far2l?style=social&label=far2l)](https://github.com/elfmz/far2l) [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/elfmz/far2l)](https://github.com/elfmz/far2l/releases/latest)                                                                                                                                                                                                                                                                                                                          |
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/pcre2grep-10.44/total?label=⭳%20pcre2grep-10.44)](https://github.com/hemnstill/StandaloneTools/releases/tag/pcre2grep-10.44)                         | [![GitHub Repo stars](https://img.shields.io/github/stars/PCRE2Project/pcre2?style=social&label=PCRE2)](https://github.com/PCRE2Project/pcre2) [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/PCRE2Project/pcre2)](https://github.com/PCRE2Project/pcre2/releases/latest)                                                                                                                                                                                                                                                                                              |

diff --git a/redis/build_msys2.sh b/redis/build_msys2.sh
@@ -3,7 +3,7 @@ dp0="$(realpath "$(dirname "$0")")"
 set -e
 
 tool_name="redis"
-tool_version="7.2.4"
+tool_version="7.2.5"
 self_toolset_name="build-msys2"
 release_version_dirpath="$dp0/release/build"
 

diff --git a/redis/build_musl.sh b/redis/build_musl.sh
@@ -10,7 +10,7 @@ apk add --no-cache alpine-sdk make linux-headers
 echo "::endgroup::"
 
 tool_name="redis"
-tool_version="7.2.4"
+tool_version="7.2.5"
 self_toolset_name="build-musl"
 release_version_dirpath="$dp0/release/build"
 

diff --git a/redis/test_linux.sh b/redis/test_linux.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 testVersion() {
-  assertEquals "redis-cli 7.2.4" "$(../bin/redis-cli --version | head -c 15)"
+  assertEquals "redis-cli 7.2.5" "$(../bin/redis-cli --version | head -c 15)"
 }
 
 testServerVersion() {
-  assertEquals "Redis server v=7.2.4" "$(../bin/redis-server --version | head -c 20)"
+  assertEquals "Redis server v=7.2.5" "$(../bin/redis-server --version | head -c 20)"
 }
 
 # Load and run shUnit2.

diff --git a/redis/test_windows.sh b/redis/test_windows.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 testVersion() {
-  assertEquals "redis-cli 7.2.4" "$(../bin/redis-cli.exe --version | head -c 15)"
+  assertEquals "redis-cli 7.2.5" "$(../bin/redis-cli.exe --version | head -c 15)"
 }
 
 testServerVersion() {
-  assertEquals "Redis server v=7.2.4" "$(../bin/redis-server.exe --version | head -c 20)"
+  assertEquals "Redis server v=7.2.5" "$(../bin/redis-server.exe --version | head -c 20)"
 }
 
 # Load and run shUnit2.