actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-16 14:47:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[macOS] Add openssl 1.1 back

Browse Source
This commit is contained in:
sarathrajsrinivasan
2024-11-07 19:02:19 -06:00
parent b4c921107c
commit 84c4b32b94
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
images/macos/scripts/build/install-openssl.sh
View File

@@ -6,20 +6,22 @@
source ~/utils/utils.sh source ~/utils/utils.sh
echo "Install openssl@3" echo "Install openssl@1.1"
brew_smart_install "openssl@3"
if ! is_Arm64; then wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz
# Symlink brew openssl@3 to `/usr/local/bin` as Homebrew refuses tar -xvf openssl-1.1.1w.tar.gz
ln -sf $(brew --prefix openssl@3)/bin/openssl /usr/local/bin/openssl cd openssl-1.1.1w
else ./config --prefix=/usr/local/openssl
# arm64 has a different installation prefix for brew make
ln -sf $(brew --prefix openssl@3)/bin/openssl /opt/homebrew/bin/openssl sudo make install
fi export OPENSSL="/usr/local/openssl/bin"
echo "export OPENSSL=${OPENSSL}" >> ${HOME}/.bashrc
ln -sf /usr/local/openssl/bin/openssl /usr/local/bin/openssl
if ! is_Arm64; then if ! is_Arm64; then
# Most of build systems and scripts look up ssl here # Most of build systems and scripts look up ssl here
ln -sf $(brew --cellar openssl@3)/3* /usr/local/opt/openssl ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl
fi fi
invoke_tests "OpenSSL" invoke_tests "OpenSSL"

13
images/macos/scripts/tests/OpenSSL.Tests.ps1
View File

@@ -7,17 +7,10 @@ Describe "OpenSSL" {
} }
} }
Context "OpenSSL 3 Path Check" { Context "OpenSSL 1.1 is default" {
It "OpenSSL 3 path exists" { It "Default OpenSSL version is 1.1" {
$openSSLpath = brew --prefix openssl@3
$openSSLpath | Should -Exist
}
}
Context "OpenSSL 3 is default" {
It "Default OpenSSL version is 3" {
$commandResult = Get-CommandResult "openssl version" $commandResult = Get-CommandResult "openssl version"
$commandResult.Output | Should -Match "OpenSSL 3" $commandResult.Output | Should -Match "OpenSSL 1.1"
} }
} }
} }