mirror of
https://github.com/actions/runner-images.git
synced 2025-12-24 10:28:00 +08:00
[macOS] Remove macOS 10.14 related code in the VE repo (#4816)
* [MacOS] Remove code for macOS-10.14 * remove is_Less_BigSur in all script * remove variable the IsLessThanBigSur
This commit is contained in:
@@ -29,7 +29,7 @@ fi
|
||||
# sudo security delete-certificate -Z FF6797793A3CD798DC5B2ABEF56F73EDC9F83A64 /Library/Keychains/System.keychain
|
||||
curl https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer --output $HOME/AppleWWDRCAG3.cer --silent
|
||||
# Big Sur requires user interaction to add a cert https://developer.apple.com/forums/thread/671582, we need to use a workaround with SecItemAdd swift method
|
||||
if is_Less_BigSur; then
|
||||
if is_Catalina; then
|
||||
sudo security add-trusted-cert -d -r unspecified -k /Library/Keychains/System.keychain $HOME/AppleWWDRCAG3.cer
|
||||
else
|
||||
swiftc $HOME/image-generation/add-certificate.swift
|
||||
|
||||
@@ -5,7 +5,7 @@ source ~/utils/utils.sh
|
||||
# Close all finder windows because they can interfere with UI tests
|
||||
osascript -e 'tell application "Finder" to close windows'
|
||||
|
||||
if is_Less_BigSur; then
|
||||
if is_Catalina; then
|
||||
# Ignore available updates to prevent system pop-ups
|
||||
updateName=$(softwareupdate -l | grep "Title: " | awk -F[:,] '{print $2}' | awk '{$1=$1};1') || true
|
||||
if [ ! -z "$updateName" ]; then
|
||||
|
||||
@@ -8,7 +8,7 @@ os_name=$(sw_vers -productName)
|
||||
os_version=$(sw_vers -productVersion)
|
||||
os_build=$(sw_vers -buildVersion)
|
||||
label_version=$(echo $os_version | cut -d. -f1,2)
|
||||
if is_Less_BigSur; then
|
||||
if is_Catalina; then
|
||||
label_version=$(echo $os_version | cut -d. -f1,2)
|
||||
else
|
||||
label_version=$(echo $os_version | cut -d. -f1)
|
||||
|
||||
Reference in New Issue
Block a user