From 327ce194320d4189bd7f8289404503ed99e853ca Mon Sep 17 00:00:00 2001 From: David Siaw Date: Tue, 4 Jun 2024 15:47:23 +0900 Subject: [PATCH 1/5] add bigdecimal for ruby 3.4 --- mysql2.gemspec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql2.gemspec b/mysql2.gemspec index cc9a55e48..28fd1c301 100644 --- a/mysql2.gemspec +++ b/mysql2.gemspec @@ -22,4 +22,6 @@ Mysql2::GEMSPEC = Gem::Specification.new do |s| s.files = `git ls-files README.md CHANGELOG.md LICENSE ext lib support`.split s.metadata['msys2_mingw_dependencies'] = 'libmariadbclient' + + s.add_dependency 'bigdecimal' end From 76a221282c4f6f7e64740bfa6cb79303d5ae8aa1 Mon Sep 17 00:00:00 2001 From: David Siaw Date: Tue, 4 Jun 2024 15:48:59 +0900 Subject: [PATCH 2/5] remove ubuntu 18 because it doesnt exist anymore --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34a04ca4d..354f8a240 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: - {os: ubuntu-22.04, ruby: '3.0', db: mariadb10.6} - {os: ubuntu-20.04, ruby: '2.7', db: mariadb10.6} - {os: ubuntu-20.04, ruby: '2.7', db: mysql80} - - {os: ubuntu-18.04, ruby: '2.7', db: mysql57} + # - {os: ubuntu-18.04, ruby: '2.7', db: mysql57} # no longer exists # TODO - Windows CI # - {os: windows-2022, ruby: '3.2', db: mysql80} From 5af964dbfcfeffb3204da731dfc1309fe6a9e0a8 Mon Sep 17 00:00:00 2001 From: David Siaw Date: Tue, 4 Jun 2024 15:53:56 +0900 Subject: [PATCH 3/5] zstd --- README.md | 2 +- ci/setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cf35222d5..d44e77dc7 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ Ruby runtime and MySQL client libraries are compiled with the same OpenSSL family, 1.0 or 1.1 or 3.0, since only one can be loaded at runtime. ``` sh -$ brew install openssl@1.1 +$ brew install openssl@1.1 zstd $ gem install mysql2 -- --with-openssl-dir=$(brew --prefix openssl@1.1) or diff --git a/ci/setup.sh b/ci/setup.sh index 956608c69..938f0c8de 100644 --- a/ci/setup.sh +++ b/ci/setup.sh @@ -70,7 +70,7 @@ if [[ x$OSTYPE =~ ^xdarwin ]]; then done brew info "$DB" - brew install "$DB" + brew install "$DB" zstd DB_PREFIX="$(brew --prefix "${DB}")" export PATH="${DB_PREFIX}/bin:${PATH}" export LDFLAGS="-L${DB_PREFIX}/lib" From 7777b9ad89b1fba4b1991bdac0f87aa1713adc5a Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Thu, 5 Sep 2024 09:54:27 -0700 Subject: [PATCH 4/5] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 354f8a240..ed5493628 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: - {os: ubuntu-22.04, ruby: '3.0', db: mariadb10.6} - {os: ubuntu-20.04, ruby: '2.7', db: mariadb10.6} - {os: ubuntu-20.04, ruby: '2.7', db: mysql80} - # - {os: ubuntu-18.04, ruby: '2.7', db: mysql57} # no longer exists + # - {os: ubuntu-20.04, ruby: '2.7', db: mysql57} # no longer exists # TODO - Windows CI # - {os: windows-2022, ruby: '3.2', db: mysql80} From b5536109c53a4a722ef89a0a22d67bf5b36c5094 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Thu, 5 Sep 2024 09:54:43 -0700 Subject: [PATCH 5/5] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed5493628..79f7d10fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: - {os: ubuntu-22.04, ruby: '3.0', db: mariadb10.6} - {os: ubuntu-20.04, ruby: '2.7', db: mariadb10.6} - {os: ubuntu-20.04, ruby: '2.7', db: mysql80} - # - {os: ubuntu-20.04, ruby: '2.7', db: mysql57} # no longer exists + - {os: ubuntu-20.04, ruby: '2.7', db: mysql57} # TODO - Windows CI # - {os: windows-2022, ruby: '3.2', db: mysql80}