Skip to content

Commit

Permalink
Merge pull request #1224 from brianmario/maria-on-macos
Browse files Browse the repository at this point in the history
Fix more builds
  • Loading branch information
tenderlove authored Dec 1, 2021
2 parents 217ac2e + ae93ec5 commit d03f3e1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ jobs:
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Install openssl
if: matrix.os == 'macos-latest'
run: |
brew update
brew install openssl
- run: ruby -v
- run: bundle install --without development
- if: matrix.db != ''
Expand Down
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ gem 'irb', require: false
group :test do
gem 'eventmachine' unless RUBY_PLATFORM =~ /mswin|mingw/
gem 'rspec', '~> 3.2'

# Downgrade psych because old RuboCop can't use new Psych
gem 'psych', '< 4.0.0'
# https://github.com/bbatsov/rubocop/pull/4789
gem 'rubocop', '~> 0.50.0'
end
Expand Down
2 changes: 1 addition & 1 deletion spec/mysql2/client_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ def run_gc
end
expect do
@client.query("SELECT SLEEP(1)")
end.to raise_error(Mysql2::Error, /Lost connection to MySQL server/)
end.to raise_error(Mysql2::Error, /Lost connection/)

if RUBY_PLATFORM !~ /mingw|mswin/
expect do
Expand Down

0 comments on commit d03f3e1

Please sign in to comment.