Remove all macOS-10.15 related code (#7078)

This commit is contained in:
sergei-pyshnoi
2023-02-13 16:40:48 +01:00
committed by GitHub
parent 539b772d6b
commit 8767a6eb4e
21 changed files with 29 additions and 752 deletions

View File

@@ -36,9 +36,9 @@ defaults write com.apple.VoiceOver4/default SCREnableAppleScript -bool YES
# Confirm that the correct intermediate certificate is installed by verifying the expiration date is set to 2030.
# sudo security delete-certificate -Z FF6797793A3CD798DC5B2ABEF56F73EDC9F83A64 /Library/Keychains/System.keychain
# 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_Catalina; then
swiftc "${HOME}/image-generation/add-certificate.swift"
fi
swiftc "${HOME}/image-generation/add-certificate.swift"
certs=(
AppleWWDRCAG3.cer
@@ -49,11 +49,7 @@ for cert in ${certs[@]}; do
cert_path="${HOME}/${cert}"
curl "https://www.apple.com/certificateauthority/${cert}" --output ${cert_path} --silent
if is_Catalina; then
sudo security add-trusted-cert -d -r unspecified -k /Library/Keychains/System.keychain ${cert_path}
else
sudo ./add-certificate ${cert_path}
fi
sudo ./add-certificate ${cert_path}
rm ${cert_path}
done

View File

@@ -5,14 +5,6 @@ source ~/utils/utils.sh
# Close all finder windows because they can interfere with UI tests
close_finder_window
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
sudo softwareupdate --ignore "$updateName"
fi
fi
# Remove Parallels Desktop
# https://github.com/actions/runner-images/issues/6105
if is_Monterey; then

View File

@@ -8,11 +8,8 @@ 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_Catalina; then
label_version=$(echo $os_version | cut -d. -f1,2)
else
label_version=$(echo $os_version | cut -d. -f1)
fi
label_version=$(echo $os_version | cut -d. -f1)
image_label="macos-${label_version}"
release_label="macOS-${label_version}"
software_url="https://github.com/actions/runner-images/blob/${release_label}/${image_version}/images/macos/${image_label}-Readme.md"