[macOS] improve [email protected] installation on arm64 (#8353)
This commit is contained in:
@@ -4,11 +4,15 @@ source ~/utils/utils.sh
|
|||||||
echo "Install [email protected]"
|
echo "Install [email protected]"
|
||||||
brew_smart_install "[email protected]"
|
brew_smart_install "[email protected]"
|
||||||
|
|
||||||
# Intel-related symlinks, not needed on arm64 for now
|
|
||||||
if ! is_VenturaArm64; then
|
if ! is_VenturaArm64; then
|
||||||
# Symlink brew [email protected] to `/usr/local/bin` as Homebrew refuses
|
# Symlink brew [email protected] to `/usr/local/bin` as Homebrew refuses
|
||||||
ln -sf $(brew --prefix [email protected])/bin/openssl /usr/local/bin/openssl
|
ln -sf $(brew --prefix [email protected])/bin/openssl /usr/local/bin/openssl
|
||||||
|
else
|
||||||
|
# arm64 has a different installation prefix for brew
|
||||||
|
ln -sf $(brew --prefix [email protected])/bin/openssl /opt/homebrew/bin/openssl
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! is_VenturaArm64; then
|
||||||
# Most of buildsystems and scripts look up ssl here
|
# Most of buildsystems and scripts look up ssl here
|
||||||
ln -sf $(brew --cellar [email protected])/1.1* /usr/local/opt/openssl
|
ln -sf $(brew --cellar [email protected])/1.1* /usr/local/opt/openssl
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
|
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
|
||||||
$os = Get-OSVersion
|
|
||||||
|
|
||||||
Describe "OpenSSL" -Skip:($os.IsVenturaArm64) {
|
Describe "OpenSSL" {
|
||||||
Context "OpenSSL Version" {
|
Context "OpenSSL Version" {
|
||||||
It "OpenSSL is available" {
|
It "OpenSSL is available" {
|
||||||
"openssl version" | Should -ReturnZeroExitCode
|
"openssl version" | Should -ReturnZeroExitCode
|
||||||
@@ -10,7 +9,7 @@ Describe "OpenSSL" -Skip:($os.IsVenturaArm64) {
|
|||||||
|
|
||||||
Context "OpenSSL 1.1 Path Check" {
|
Context "OpenSSL 1.1 Path Check" {
|
||||||
It "OpenSSL 1.1 path exists" {
|
It "OpenSSL 1.1 path exists" {
|
||||||
$openSSLpath = "/usr/local/opt/[email protected]"
|
$openSSLpath = brew --prefix openssl@1.1
|
||||||
$openSSLpath | Should -Exist
|
$openSSLpath | Should -Exist
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user