CI: Use specific Homebrew openssl@1.1

brianmario · Jan 19, 2023 · 5bb28f7 · 5bb28f7
1 parent e5a35f1
commit 5bb28f7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -61,8 +61,6 @@ jobs:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - if: matrix.db != ''
         run: echo 'DB=${{ matrix.db }}' >> $GITHUB_ENV
-      - if: startsWith(matrix.os, 'macos') && matrix.ssl != ''
-        run: echo "RUBY_MYSQL2_SSL_DIR=$(brew --prefix ${{ matrix.ssl }})" >> $GITHUB_ENV
       - run: sudo echo "127.0.0.1 mysql2gem.example.com" | sudo tee -a /etc/hosts
       - run: bash ci/setup.sh
-      - run: bundle exec rake spec
+      - run: bundle exec rake spec -- $([ -x "$(which brew)" ] && echo --with-openssl-dir=$(brew --prefix ${{ matrix.ssl }}))
diff --git a/tasks/compile.rake b/tasks/compile.rake
@@ -51,9 +51,6 @@ Rake::ExtensionTask.new("mysql2", Mysql2::GEMSPEC) do |ext|
       POST_INSTALL_MESSAGE
     end
   end
-
-  ssl_dir = ENV['RUBY_MYSQL2_SSL_DIR']
-  ext.config_options << "--with-ssl-dir=#{ssl_dir}" if ssl_dir
 end
 Rake::Task[:spec].prerequisites << :compile