Skip to content

Commit

Permalink
Merge pull request #97 from ahawkins/feature/support-openssl@1.1
Browse files Browse the repository at this point in the history
Use OpenSSL 1.1 on macOS
  • Loading branch information
smorimoto authored Feb 3, 2022
2 parents 892c9bc + 53b66ef commit ab86d61
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ jobs:

steps:
- name: Install packages
run: brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip pkg-config re2c zlib
run: brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip openssl@1.1 pkg-config re2c zlib

- name: Install conflicting packages
run: brew install openssl@3

- name: asdf_plugin_test
uses: asdf-vm/actions/plugin-test@v1
Expand Down
4 changes: 2 additions & 2 deletions bin/install
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ install_php() {
local krb5_path=$(homebrew_package_path krb5)
local libedit_path=$(homebrew_package_path libedit)
local libxml2_path=$(homebrew_package_path libxml2)
local openssl_path=$(homebrew_package_path openssl)
local openssl_path=$(homebrew_package_path openssl@1.1)

if [ -n "$bison_path" ]; then
export "PATH=${bison_path}/bin:${PATH}"
Expand Down Expand Up @@ -210,7 +210,7 @@ os_based_configure_options() {
local libpng_path=$(homebrew_package_path libpng)
local libxml2_path=$(homebrew_package_path libxml2)
local libzip_path=$(homebrew_package_path libzip)
local openssl_path=$(homebrew_package_path openssl)
local openssl_path=$(homebrew_package_path openssl@1.1)
local readline_path=$(homebrew_package_path readline)
local webp_path=$(homebrew_package_path webp)
local zlib_path=$(homebrew_package_path zlib)
Expand Down

0 comments on commit ab86d61

Please sign in to comment.