Skip to content

Commit

Permalink
CI: fixes and improvements (#1371)
Browse files Browse the repository at this point in the history
* Add bigdecimal dependency, no longer installed by default in Ruby 3.4
* CI: remove Ubuntu 18.04 image because it doesn't exist anymore
* CI: brew install zstd on MacOS

Co-authored-by: Aaron Stone <aaron@serendipity.cx>
  • Loading branch information
davidsiaw and sodabrew authored Dec 4, 2024
1 parent 15f8e6e commit d7d2eee
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-20.04, ruby: '2.7', db: mysql57}

# TODO - Windows CI
# - {os: windows-2022, ruby: '3.2', db: mysql80}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion mysql2.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ Mysql2::GEMSPEC = Gem::Specification.new do |s|

s.metadata['msys2_mingw_dependencies'] = 'libmariadbclient'

s.add_runtime_dependency 'bigdecimal'
s.add_dependency 'bigdecimal'
end

0 comments on commit d7d2eee

Please sign in to comment.