[macOS] Remove macOS 10.13 related code in the VE repo (#4494)

Author: dibir-magomedsaygitov

images.CI/macos/azure-pipelines/macos1013.yml

@@ -82,10 +82,8 @@ try {
 }
 
 try {
-    if ($VMName -notmatch "10.13") {
-        Write-Host "Change CPU count to $CpuCount, cores count to $CoresPerSocketCount, amount of RAM to $Memory"
-        $vm | Set-VM -NumCPU $CpuCount -CoresPerSocket $CoresPerSocketCount -MemoryMB $Memory -Confirm:$false -ErrorAction Stop | Out-Null
-    }
+    Write-Host "Change CPU count to $CpuCount, cores count to $CoresPerSocketCount, amount of RAM to $Memory"
+    $vm | Set-VM -NumCPU $CpuCount -CoresPerSocket $CoresPerSocketCount -MemoryMB $Memory -Confirm:$false -ErrorAction Stop | Out-Null
 } catch {
     Write-Host "##vso[task.LogIssue type=error;]Failed to change specs for VM '$VMName'"
 }

images.CI/macos/move-vm.ps1

@@ -34,7 +34,6 @@ function Get-OSVersion {
     return [PSCustomObject]@{
         Version = $osVersion.Version
         Platform = $osVersion.Platform
-        IsHighSierra = $osVersionMajorMinor -eq "10.13"
         IsMojave = $osVersionMajorMinor -eq "10.14"
         IsCatalina = $osVersionMajorMinor -eq "10.15"
         IsBigSur = $osVersionMajorMinor -eq "11.0"

images/macos/helpers/Common.Helpers.psm1

@@ -4,17 +4,9 @@ source ~/utils/utils.sh
 echo "Installing Firefox..."
 brew install --cask firefox
 
-# High Sierra builds driver from sources, and it takes about 2 hours. It's much faster to download the binary directly
-if ! is_HighSierra; then
-    echo "Installing Geckodriver..."
-    brew_smart_install "geckodriver"
-    geckoPath="$(brew --prefix geckodriver)/bin"
-else
-    geckoUrl="$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest | jq -r '.assets[].browser_download_url | select(endswith("macos.tar.gz"))')"
-    download_with_retries $geckoUrl "/tmp" "geckodriver.tar.gz"
-    geckoPath="/usr/local/bin"
-    tar -xzf /tmp/geckodriver.tar.gz -C $geckoPath
-fi
+echo "Installing Geckodriver..."
+brew_smart_install "geckodriver"
+geckoPath="$(brew --prefix geckodriver)/bin"
 
 echo "Add GECKOWEBDRIVER to bashrc..."
 echo "export GECKOWEBDRIVER=${geckoPath}" >> "${HOME}/.bashrc"

images/macos/macos-10.13-Readme.md

@@ -9,11 +9,6 @@ GEM_PATH=`gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}'`
 echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc"
 echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"'  >> "$HOME/.bashrc"
 
-#if High Sierra - skip installation from toolset
-if is_HighSierra; then
-    exit 0
-fi
-
 echo "Install Ruby from toolset..."
 PACKAGE_TAR_NAMES=$(curl -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name')
 TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]')

images/macos/provision/core/firefox.sh

@@ -71,32 +71,24 @@ is_Mojave() {
     fi
 }
 
-is_HighSierra() {
-    if [ "$OSTYPE" = "darwin17" ]; then
-        true
-    else
-        false
-    fi
-}
-
 is_Less_Catalina() {
-    if is_HighSierra || is_Mojave; then
+    if is_Mojave; then
         true
     else
         false
     fi
 }
 
 is_Less_BigSur() {
-    if is_HighSierra || is_Mojave || is_Catalina; then
+    if is_Mojave || is_Catalina; then
         true
     else
         false
     fi
 }
 
 is_Less_Monterey() {
-    if is_HighSierra || is_Mojave || is_Catalina || is_BigSur; then
+    if is_Mojave || is_Catalina || is_BigSur; then
         true
     else
         false
@@ -132,9 +124,7 @@ brew_cask_install_ignoring_sha256() {
 }
 
 get_brew_os_keyword() {
-    if is_HighSierra; then
-        echo "high_sierra"
-    elif is_Mojave; then
+    if is_Mojave; then
         echo "mojave"
     elif is_Catalina; then
         echo "catalina"

images/macos/provision/core/ruby.sh

@@ -52,7 +52,7 @@ if ($os.IsLessThanMonterey) {
     )
 }
 
-if ( -not $os.IsHighSierra -and $os.IsLessThanMonterey) {
+if ($os.IsLessThanMonterey) {
     $languageAndRuntimeList += @(
         (Get-GccVersion)
         (Get-FortranVersion)
@@ -163,7 +163,7 @@ if ($os.IsLessThanBigSur) {
     )
 }
 
-if (-not $os.IsHighSierra -and $os.IsLessThanMonterey) {
+if ($os.IsLessThanMonterey) {
     $utilitiesList += @(
         (Get-SwitchAudioOsxVersion),
         (Get-SoxVersion)
@@ -195,37 +195,28 @@ if ($os.IsLessThanMonterey) {
 $toolsList += @(
     (Get-XcodeCommandLineToolsVersion),
     (Get-SwigVersion),
-    (Get-BicepVersion)
+    (Get-BicepVersion),
+    (Get-GHCupVersion),
+    (Get-GHCVersion),
+    (Get-CabalVersion),
+    (Get-StackVersion)
 )
 
-if( -not $os.IsHighSierra) {
+if($os.IsLessThanMonterey) {
     $toolsList += @(
-        (Get-GHCupVersion),
-        (Get-GHCVersion),
-        (Get-CabalVersion),
-        (Get-StackVersion)
+        (Get-SwiftFormatVersion)
     )
-    if($os.IsLessThanMonterey) {
-        $toolsList += @(
-            (Get-SwiftFormatVersion)
-        )
-    }
 }
 
 $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object)
 
 # Linters
 $markdown += New-MDHeader "Linters" -Level 3
 $lintersList = @(
-    (Get-YamllintVersion)
+    (Get-YamllintVersion),
+    (Get-SwiftLintVersion)
 )
 
-if ( -not $os.IsHighSierra) {
-    $lintersList += @(
-        (Get-SwiftLintVersion)
-    )
-}
-
 $markdown += New-MDList -Style Unordered -Lines ($lintersList | Sort-Object)
 
 $markdown += New-MDHeader "Browsers" -Level 3
@@ -241,27 +232,25 @@ $markdown += New-MDNewLine
 # Toolcache
 $markdown += Build-ToolcacheSection
 
-if ( -not $os.IsHighSierra) {
-    $markdown += New-MDHeader "Rust Tools" -Level 3
-    $markdown += New-MDList -Style Unordered -Lines (@(
-        (Get-RustVersion),
-        (Get-RustupVersion),
-        (Get-RustdocVersion),
-        (Get-RustCargoVersion)
-        ) | Sort-Object
-    )
-    
-    $markdown += New-MDHeader "Packages" -Level 4
-    $markdown += New-MDList -Style Unordered -Lines (@(
-        (Get-Bindgen),
-        (Get-Cbindgen),
-        (Get-Cargooutdated),
-        (Get-Cargoaudit),
-        (Get-RustfmtVersion),
-        (Get-RustClippyVersion)
-        ) | Sort-Object
-    )
-}
+$markdown += New-MDHeader "Rust Tools" -Level 3
+$markdown += New-MDList -Style Unordered -Lines (@(
+    (Get-RustVersion),
+    (Get-RustupVersion),
+    (Get-RustdocVersion),
+    (Get-RustCargoVersion)
+    ) | Sort-Object
+)
+
+$markdown += New-MDHeader "Packages" -Level 4
+$markdown += New-MDList -Style Unordered -Lines (@(
+    (Get-Bindgen),
+    (Get-Cbindgen),
+    (Get-Cargooutdated),
+    (Get-Cargoaudit),
+    (Get-RustfmtVersion),
+    (Get-RustClippyVersion)
+    ) | Sort-Object
+)
 
 $markdown += New-MDHeader "PowerShell Tools" -Level 3
 $markdown += New-MDList -Lines (Get-PowershellVersion) -Style Unordered

images/macos/provision/core/toolcache-high-sierra.sh

@@ -53,13 +53,10 @@ function Build-ToolcacheSection {
     $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered
     $output += New-MDHeader "PyPy" -Level 4
     $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered
-
-    if( -not $os.IsHighSierra) {
-        $output += New-MDHeader "Node.js" -Level 4
-        $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered
-        $output += New-MDHeader "Go" -Level 4
-        $output += Get-ToolcacheGoTable
-    }
+    $output += New-MDHeader "Node.js" -Level 4
+    $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered
+    $output += New-MDHeader "Go" -Level 4
+    $output += Get-ToolcacheGoTable
 
     return $output
 }