Skip to content

Commit d03f3e1

Browse files
authored
Merge pull request #1224 from brianmario/maria-on-macos
Fix more builds
2 parents 217ac2e + ae93ec5 commit d03f3e1

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ jobs:
5555
- uses: ruby/setup-ruby@v1
5656
with:
5757
ruby-version: ${{ matrix.ruby }}
58+
- name: Install openssl
59+
if: matrix.os == 'macos-latest'
60+
run: |
61+
brew update
62+
brew install openssl
5863
- run: ruby -v
5964
- run: bundle install --without development
6065
- if: matrix.db != ''

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ gem 'irb', require: false
1515
group :test do
1616
gem 'eventmachine' unless RUBY_PLATFORM =~ /mswin|mingw/
1717
gem 'rspec', '~> 3.2'
18+
19+
# Downgrade psych because old RuboCop can't use new Psych
20+
gem 'psych', '< 4.0.0'
1821
# https://github.com/bbatsov/rubocop/pull/4789
1922
gem 'rubocop', '~> 0.50.0'
2023
end

spec/mysql2/client_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ def run_gc
604604
end
605605
expect do
606606
@client.query("SELECT SLEEP(1)")
607-
end.to raise_error(Mysql2::Error, /Lost connection to MySQL server/)
607+
end.to raise_error(Mysql2::Error, /Lost connection/)
608608

609609
if RUBY_PLATFORM !~ /mingw|mswin/
610610
expect do

0 commit comments

Comments
 (0)