hemnstill · hemnstill · Jun 26, 2024 · Jun 26, 2024 · Jun 26, 2024 · Jun 26, 2024
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -12,11 +12,21 @@ on:
         required: false
         type: string
         default: '2019'
+      vcpkg_install:
+        required: false
+        type: string
+        default: ''
 
 jobs:
   build-windows:
     runs-on: windows-${{ inputs.version }}
     steps:
+      - name: vcpkg install (Windows)
+        if: ${{ inputs.vcpkg_install != '' }}
+        shell: powershell
+        run: |
+          vcpkg install ${{ inputs.vcpkg_install }}
+
       - uses: actions/checkout@v3
       - name: build ${{ inputs.workflow }}-windows-${{ inputs.toolset }}
         run: |

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
@@ -8,6 +8,7 @@ jobs:
     uses: ./.github/workflows/build-alpine.yml
     with:
       workflow: ${{ github.workflow }}
+      version: 3.19.2
 
   ubuntu-gnu:
     if: ${{ vars.CURRENT_TOOL == github.workflow }}
@@ -23,6 +24,7 @@ jobs:
       workflow: ${{ github.workflow }}
       toolset: msvc
       version: 2022
+      vcpkg_install: openssl:x64-windows
 
   test-alpine:
     needs: alpine-musl
@@ -86,7 +88,7 @@ jobs:
     uses: ./.github/workflows/release.yml
     with:
       workflow: ${{ github.workflow }}
-      tool_version: '8.3.0'
+      tool_version: '8.4.0'
       prepare_body: |
         bsdtar -Oxf ./build-musl/build-musl.tar.gz build-musl.md >> body.md
         bsdtar -Oxf ./build-gnu/build-gnu.tar.gz build-gnu.md >> body.md

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/7-Zip-24.06/total?label=⭳%207-Zip-24.06)](https://github.com/hemnstill/StandaloneTools/releases/tag/7-Zip-24.06)                                     | [![SourceForge Downloads](https://img.shields.io/sourceforge/dm/sevenzip?style=social&label=7-Zip&logo=sourceforge)](https://sourceforge.net/projects/sevenzip/) [![versions](https://repology.org/badge/latest-versions/7zip.svg)](https://repology.org/project/7zip/versions)                                                                                                                                                                                                                                                                                                                                            |
 | [![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.3.0/total?label=⭳%20mysql-8.3.0)](https://github.com/hemnstill/StandaloneTools/releases/tag/mysql-8.3.0)                                     | [![GitHub Repo stars](https://img.shields.io/github/stars/mysql/mysql-server?style=social&label=mysql-server)](https://github.com/mysql/mysql-server) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/mysql/mysql-server)](https://dev.mysql.com/doc/relnotes/mysql/en/)                                                                                                                                                                                                                                                                                                                                |
+| [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/mysql-8.4.0/total?label=⭳%20mysql-8.4.0)](https://github.com/hemnstill/StandaloneTools/releases/tag/mysql-8.4.0)                                     | [![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/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.5.3/total?label=⭳%20far2l-2.5.3)](https://github.com/hemnstill/StandaloneTools/releases/tag/far2l-2.5.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)                                                                                                                                                                                                                                                                                                                          |

diff --git a/mysql/build_gnu.sh b/mysql/build_gnu.sh
@@ -13,7 +13,7 @@ apt install -y libaio-dev libudev-dev libssl-dev ncurses-dev libc6-dev
 echo "::endgroup::"
 
 tool_name="mysql"
-tool_version="8.3.0"
+tool_version="8.4.0"
 self_toolset_name="build-gnu"
 release_version_dirpath="$dp0/release/build"
 

diff --git a/mysql/build_msvc.sh b/mysql/build_msvc.sh
@@ -7,7 +7,7 @@ echo "::group::install deps"
 echo "::endgroup::"
 
 tool_name="mysql"
-tool_version="8.3.0"
+tool_version="8.4.0"
 self_toolset_name="build-msvc"
 release_version_dirpath="$dp0/release/build"
 
@@ -45,7 +45,7 @@ cp -rf "./runtime_output_directory/Release/." "$release_version_dirpath/"
 
 cd "$release_version_dirpath"
 
-find . -mindepth 1 -maxdepth 1 -name '*test*' -exec rm -f "{}" \;
+find . -mindepth 1 -maxdepth 1 \( -name '*test*' -or -name '*.pdb' \) -exec rm -f "{}" \;
 find . -mindepth 1 -maxdepth 1 \( ! -name "mysql*" -and ! -name "lib*" \) -exec rm -f "{}" \;
 
 { printf '### %s

diff --git a/mysql/build_musl.sh b/mysql/build_musl.sh
@@ -11,7 +11,7 @@ apk add --no-cache libaio-dev eudev-dev openldap-dev openssl-dev openssl-libs-st
 echo "::endgroup::"
 
 tool_name="mysql"
-tool_version="8.3.0"
+tool_version="8.4.0"
 self_toolset_name="build-musl"
 release_version_dirpath="$dp0/release/build"
 
@@ -27,7 +27,6 @@ wget "$download_url" -O "tool-$tool_version.tar.gz"
 "$bsdtar" -xf "tool-$tool_version.tar.gz" && cd "mysql-server-mysql-$tool_version"
 
 patch "./libmysql/dns_srv.cc" "$dp0/release/mysql-connector-c-8.0.27-res_n.patch"
-patch "./sql/memory/aligned_atomic.h" "$dp0/release/_cache_line_size.patch"
 
 echo "::endgroup::"
 

diff --git a/mysql/release/_cache_line_size.patch b/mysql/release/_cache_line_size.patch
diff --git a/mysql/test_linux.sh b/mysql/test_linux.sh
@@ -3,7 +3,7 @@
 "../.tools/install_alpine_glibc.sh"
 
 testVersion() {
-  assertEquals "../bin/mysql  Ver 8.3.0 for Linux on x86_64 (Source distribution)" "$(../bin/mysql --version)"
+  assertEquals "../bin/mysql  Ver 8.4.0 for Linux on x86_64 (Source distribution)" "$(../bin/mysql --version)"
 }
 
 # Load and run shUnit2.

diff --git a/mysql/test_windows.sh b/mysql/test_windows.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 testVersion() {
-  assertEquals "../bin/mysql.exe  Ver 8.3.0 for Win64 on x86_64 (Source distribution)" "$(../bin/mysql.exe --version)"
+  assertEquals "../bin/mysql.exe  Ver 8.4.0 for Win64 on x86_64 (Source distribution)" "$(../bin/mysql.exe --version)"
 }
 
 # Load and run shUnit2.