[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:
V-Zabayrachny
2021-12-30 10:36:59 +03:00
committed by GitHub
parent 29dbc46881
commit 3c2f1c6350
24 changed files with 33 additions and 1127 deletions

View File

@@ -93,7 +93,7 @@ done
# The Android Emulator uses the built-in Hypervisor.Framework by default, and falls back to using Intel HAXM if Hypervisor.Framework fails to initialize
# https://developer.android.com/studio/run/emulator-acceleration#vm-mac
# The installation doesn't work properly on macOS Big Sur, /dev/HAX is not created
if is_Less_BigSur; then
if is_Catalina; then
chmod +x $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh
sudo $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh
fi

View File

@@ -9,7 +9,7 @@ brew_smart_install "sox"
# Big Sur doesn't support soundflower installation without user interaction https://github.com/mattingalls/Soundflower/releases/tag/2.0b2
# Install blackhole-2ch for Big Sur instead
if is_Less_BigSur; then
if is_Catalina; then
echo "install soundflower"
brew install --cask soundflower

View File

@@ -16,12 +16,6 @@ for package in $cask_packages; do
brew install --cask $package
done
# Specify Bazel version 3.7.1 to install due to the bug with 4.0.0: https://github.com/bazelbuild/bazel/pull/12882
if is_Less_Catalina; then
export USE_BAZEL_VERSION="3.7.1"
echo "export USE_BAZEL_VERSION=${USE_BAZEL_VERSION}" >> "${HOME}/.bashrc"
fi
# Invoke bazel to download bazel version via bazelisk
bazel

View File

@@ -22,21 +22,11 @@ DOTNET_VERSIONS=($(get_toolset_value '.dotnet.versions | .[]'))
for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do
RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/master/release-notes/${DOTNET_VERSION}/releases.json"
# Old Mono versions don't support NuGet versions from .Net sdk >=2.1.6**, exclude them explicitly from Mojave and HS images
# https://rider-support.jetbrains.com/hc/en-us/articles/360004180039
if is_Less_Catalina; then
ARGS_LIST+=(
$(curl -s "$RELEASE_URL" | \
jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | grep -v -E '2.1.[6-9]\d*' | \
sort -r | rev | uniq -s 2 | rev)
)
else
ARGS_LIST+=(
$(curl -s "$RELEASE_URL" | \
jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \
sort -r | rev | uniq -s 2 | rev)
)
fi
ARGS_LIST+=(
$(curl -s "$RELEASE_URL" | \
jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \
sort -r | rev | uniq -s 2 | rev)
)
done
for ARGS in "${ARGS_LIST[@]}"; do

View File

@@ -1,22 +1,11 @@
#!/bin/bash -e -o pipefail
source ~/utils/utils.sh
if is_Less_Catalina; then
echo Installing the latest Node JS 8...
TMP_FILE=/tmp/node-v8.17.0.pkg
NODEURL=https://nodejs.org/dist/latest-v8.x/node-v8.17.0.pkg
download_with_retries $NODEURL "/tmp"
sudo installer -pkg "${TMP_FILE}" -target /
rm -rf "${TMP_FILE}"
sudo chown -R $USER "/usr/local/lib/node_modules"
else
# Install default Node.js for macOS >= 10.15
defaultVersion=$(get_toolset_value '.node.default')
defaultVersion=$(get_toolset_value '.node.default')
echo "Installing Node.js $defaultVersion"
brew_smart_install "node@$defaultVersion"
brew link node@$defaultVersion --force
fi
echo "Installing Node.js $defaultVersion"
brew_smart_install "node@$defaultVersion"
brew link node@$defaultVersion --force
echo Installing yarn...
curl -o- -L https://yarnpkg.com/install.sh | bash

View File

@@ -79,7 +79,7 @@ done
# Big Sur or newer does not have these versions of Adopt.
# Also hardcode these versions as they only exist for Adopt
if is_Less_BigSur; then
if is_Catalina; then
for adoptVersionToInstall in 12 13 14; do
createEnvironmentVariable ${adoptVersionToInstall} "Adopt"
done

View File

@@ -7,7 +7,7 @@ psDownloadUrl=$(echo $psRelease | jq -r '.assets[].browser_download_url | select
download_with_retries $psDownloadUrl "/tmp" "powershell.pkg"
# Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package
if ! is_Less_BigSur; then
if ! is_Catalina; then
sudo xattr -rd com.apple.quarantine /tmp/powershell.pkg
fi

View File

@@ -64,17 +64,11 @@ createBundleLink $CURRENT_SDK_SYMLINK "Current"
# Fix nuget in some mono versions because of known bugs
#
if is_Less_BigSur; then
if is_Catalina; then
# Fix Mono issue with default nuget: https://github.com/mono/mono/issues/17637
installNuget "6.4.0" "5.3.1"
fi
if is_Less_Catalina; then
installNuget "4.8.1" "4.3.0"
installNuget "5.0.1" "4.3.0"
installNuget "5.2.0" "4.3.0"
fi
# Creating UWP Shim to hack UWP build failure
createUWPShim

View File

@@ -32,10 +32,6 @@ $xcodeVersions | ForEach-Object -ThrottleLimit $threadCount -Parallel {
}
Write-Host "Configuring Xcode versions..."
if ($os.IsLessThanCatalina) {
$latestXcodeVersion = $xcodeVersions | Select-Object -Last 1 -ExpandProperty link
Install-XcodeAdditionalPackages -Version $latestXcodeVersion
}
$xcodeVersions | ForEach-Object {
Invoke-XcodeRunFirstLaunch -Version $_.link
}