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

[macOS] prepare repository for macOS 13 (#7156)

Browse Source
This commit is contained in:
Alexey-Ayupov
2023-02-28 22:24:25 +03:00
committed by GitHub
parent 9089d1ec95
commit c6c2716726
9 changed files with 161 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
images/macos/provision/configuration/finalize-vm.sh
View File

@@ -28,8 +28,9 @@ rm -rf ~/.fastlane
npm cache clean --force npm cache clean --force
# Clean yarn cache # Clean yarn cache
yarn cache clean if ! is_Ventura; then
yarn cache clean
fi
# Clean up temporary directories # Clean up temporary directories
sudo rm -rf ~/utils ~/image-generation /tmp/* sudo rm -rf ~/utils ~/image-generation /tmp/*

18
images/macos/provision/core/commonutils.sh
View File

@@ -14,12 +14,14 @@ cask_packages=$(get_toolset_value '.brew.cask_packages[]')
for package in $cask_packages; do for package in $cask_packages; do
echo "Installing $package..." echo "Installing $package..."
if [[ $package == "virtualbox" ]]; then if [[ $package == "virtualbox" ]]; then
if ! is_Ventura; then
# VirtualBox 7 crashes # VirtualBox 7 crashes
# macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now. # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now.
vbcask_url="https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb" vbcask_url="https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb"
download_with_retries $vbcask_url download_with_retries $vbcask_url
brew install ./virtualbox.rb brew install ./virtualbox.rb
rm ./virtualbox.rb rm ./virtualbox.rb
fi
else else
brew install --cask $package brew install --cask $package
fi fi
@@ -34,22 +36,18 @@ fi
# System Preferences -> Security & Privacy -> General -> Unlock -> Allow -> Not now # System Preferences -> Security & Privacy -> General -> Unlock -> Allow -> Not now
if is_Monterey; then if is_Monterey; then
if is_Veertu; then if is_Veertu; then
retry=10 retry=5
while [ $retry -gt 0 ]; do while [ $retry -gt 0 ]; do
{ {
osascript -e 'tell application "System Events" to get application processes where visible is true' osascript -e 'tell application "System Events" to get application processes where visible is true'
} && break }
osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD
retry=$((retry-1)) echo "retries left "$retry
if [ $retry -eq 0 ]; then
echo "No retry attempts left"
exit 1
fi
sleep 10 sleep 10
done done
fi else
osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD
fi
fi fi
# Validate "Parallels International GmbH" kext # Validate "Parallels International GmbH" kext

22
images/macos/provision/core/ruby.sh
View File

@@ -9,18 +9,19 @@ GEM_PATH=`gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}'`
echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc" echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc"
echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc" echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc"
echo "Install Ruby from toolset..." if ! is_Ventura; then
[ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") echo "Install Ruby from toolset..."
PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}")
TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name')
RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]')
RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby"
echo "Check if Ruby hostedtoolcache folder exists..." echo "Check if Ruby hostedtoolcache folder exists..."
if [ ! -d $RUBY_PATH ]; then if [ ! -d $RUBY_PATH ]; then
mkdir -p $RUBY_PATH mkdir -p $RUBY_PATH
fi fi
for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do
PACKAGE_TAR_NAME=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${TOOLSET_VERSION}-macos-latest.tar.gz$" | egrep -v "rc|preview" | sort -V | tail -1) PACKAGE_TAR_NAME=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${TOOLSET_VERSION}-macos-latest.tar.gz$" | egrep -v "rc|preview" | sort -V | tail -1)
RUBY_VERSION=$(echo "$PACKAGE_TAR_NAME" | cut -d'-' -f 2) RUBY_VERSION=$(echo "$PACKAGE_TAR_NAME" | cut -d'-' -f 2)
RUBY_VERSION_PATH="$RUBY_PATH/$RUBY_VERSION" RUBY_VERSION_PATH="$RUBY_PATH/$RUBY_VERSION"
@@ -40,6 +41,7 @@ for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do
echo "Create complete file" echo "Create complete file"
touch $COMPLETE_FILE_PATH touch $COMPLETE_FILE_PATH
fi fi
done done
fi
invoke_tests "Ruby" invoke_tests "Ruby"

120
images/macos/software-report/SoftwareReport.Generator.ps1
View File

@@ -41,15 +41,19 @@ $languageAndRuntime.AddNodes($(Get-FortranVersions))
$languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion))
$languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion))
$languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion))
$languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) if (-not $os.IsVentura) {
$languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion))
$languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion))
$languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion)) $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion))
$languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') $languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion))
$languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+')
}
$languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion))
$languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion))
$languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) if (-not $os.IsVentura) {
$languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion))
$languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version))
}
$languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) $languageAndRuntime.AddToolVersion("R", $(Get-RVersion))
$languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion))
@@ -60,12 +64,16 @@ $packageManagement.AddToolVersion("Carthage", $(Get-CarthageVersion))
$packageManagement.AddToolVersion("CocoaPods", $(Get-CocoaPodsVersion)) $packageManagement.AddToolVersion("CocoaPods", $(Get-CocoaPodsVersion))
$packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) $packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion))
$packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) $packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion))
$packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) if (-not $os.IsVentura) {
$packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion))
}
$packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) $packageManagement.AddToolVersion("NPM", $(Get-NPMVersion))
$packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion))
$packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) if (-not $os.IsVentura) {
$packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2))
$packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) $packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3))
$packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion))
}
$packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) $packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion))
$packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) $packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion))
$packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) $packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion))
@@ -75,9 +83,11 @@ $packageManagement.AddNode($(Build-PackageManagementEnvironmentTable))
# Project Management # Project Management
$projectManagement = $installedSoftware.AddHeader("Project Management") $projectManagement = $installedSoftware.AddHeader("Project Management")
$projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) $projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion))
$projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) if (-not $os.IsVentura) {
$projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) $projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion))
$projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) $projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion))
$projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion))
}
# Utilities # Utilities
$utilities = $installedSoftware.AddHeader("Utilities") $utilities = $installedSoftware.AddHeader("Utilities")
@@ -97,25 +107,32 @@ $utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion))
if ($os.IsBigSur) { if ($os.IsBigSur) {
$utilities.AddToolVersion("helm", $(Get-HelmVersion)) $utilities.AddToolVersion("helm", $(Get-HelmVersion))
} }
$utilities.AddToolVersion("Hub CLI", $(Get-HubVersion)) if (-not $os.IsVentura) {
$utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) $utilities.AddToolVersion("Hub CLI", $(Get-HubVersion))
$utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion))
}
$utilities.AddToolVersion("jq", $(Get-JqVersion)) $utilities.AddToolVersion("jq", $(Get-JqVersion))
$utilities.AddToolVersion("mongo", $(Get-MongoVersion)) if (-not $os.IsVentura) {
$utilities.AddToolVersion("mongod", $(Get-MongodVersion)) $utilities.AddToolVersion("mongo", $(Get-MongoVersion))
$utilities.AddToolVersion("mongod", $(Get-MongodVersion))
}
if ($os.IsBigSur) { if ($os.IsBigSur) {
$utilities.AddToolVersion("Newman", $(Get-NewmanVersion)) $utilities.AddToolVersion("Newman", $(Get-NewmanVersion))
} }
$utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) $utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion))
$utilities.AddToolVersion("Packer", $(Get-PackerVersion)) $utilities.AddToolVersion("Packer", $(Get-PackerVersion))
$utilities.AddToolVersion("pkg-config", $(Get-PKGConfigVersion)) if (-not $os.IsVentura) {
$utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) $utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion))
$utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) $utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion))
$utilities.AddToolVersion("Sox", $(Get-SoxVersion)) $utilities.AddToolVersion("Sox", $(Get-SoxVersion))
$utilities.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion)) $utilities.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion))
$utilities.AddToolVersion("Switchaudio-osx", $(Get-SwitchAudioOsxVersion)) $utilities.AddToolVersion("Switchaudio-osx", $(Get-SwitchAudioOsxVersion))
}
if (-not $os.IsBigSur) { if (-not $os.IsBigSur) {
$utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion)) $utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion))
if (-not $os.IsVentura) {
$utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion)) $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion))
}
} }
$utilities.AddToolVersion("yq", $(Get-YqVersion)) $utilities.AddToolVersion("yq", $(Get-YqVersion))
$utilities.AddToolVersion("zstd", $(Get-ZstdVersion)) $utilities.AddToolVersion("zstd", $(Get-ZstdVersion))
@@ -125,7 +142,9 @@ $tools = $installedSoftware.AddHeader("Tools")
if ($os.IsBigSur) { if ($os.IsBigSur) {
$tools.AddToolVersion("Aliyun CLI", $(Get-AliyunCLIVersion)) $tools.AddToolVersion("Aliyun CLI", $(Get-AliyunCLIVersion))
} }
$tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) if (-not $os.IsVentura) {
$tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion))
}
$tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) $tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion))
$tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) $tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion))
$tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) $tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion))
@@ -135,20 +154,28 @@ $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion))
$tools.AddToolVersion("Cabal", $(Get-CabalVersion)) $tools.AddToolVersion("Cabal", $(Get-CabalVersion))
$tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) $tools.AddToolVersion("Cmake", $(Get-CmakeVersion))
$tools.AddToolVersion("CodeQL Action Bundles", $(Get-CodeQLBundleVersions)) $tools.AddToolVersion("CodeQL Action Bundles", $(Get-CodeQLBundleVersions))
$tools.AddToolVersion("Colima", $(Get-ColimaVersion)) if ($os.IsMonterey) {
$tools.AddToolVersion("Colima", $(Get-ColimaVersion))
}
$tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) $tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion))
$tools.AddToolVersion("GHC", $(Get-GHCVersion)) $tools.AddToolVersion("GHC", $(Get-GHCVersion))
$tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) $tools.AddToolVersion("GHCup", $(Get-GHCupVersion))
$tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) if (-not $os.IsVentura) {
$tools.AddToolVersion("Jazzy", $(Get-JazzyVersion))
}
$tools.AddToolVersion("Stack", $(Get-StackVersion)) $tools.AddToolVersion("Stack", $(Get-StackVersion))
$tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion)) $tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion))
$tools.AddToolVersion("Swig", $(Get-SwigVersion)) if (-not $os.IsVentura) {
$tools.AddToolVersion("Swig", $(Get-SwigVersion))
}
$tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion)) $tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion))
# Linters # Linters
$linters = $installedSoftware.AddHeader("Linters") $linters = $installedSoftware.AddHeader("Linters")
$linters.AddToolVersion("SwiftLint", $(Get-SwiftLintVersion)) $linters.AddToolVersion("SwiftLint", $(Get-SwiftLintVersion))
$linters.AddToolVersion("Yamllint", $(Get-YamllintVersion)) if (-not $os.IsVentura) {
$linters.AddToolVersion("Yamllint", $(Get-YamllintVersion))
}
# Browsers # Browsers
$browsers = $installedSoftware.AddHeader("Browsers") $browsers = $installedSoftware.AddHeader("Browsers")
@@ -159,13 +186,15 @@ $browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable))
$java = $installedSoftware.AddHeader("Java") $java = $installedSoftware.AddHeader("Java")
$java.AddTable($(Get-JavaVersions)) $java.AddTable($(Get-JavaVersions))
# Graal if (-not $os.IsVentura) {
$graalvm = $installedSoftware.AddHeader("GraalVM") # Graal
$graalvm.AddTable($(Build-GraalVMTable)) $graalvm = $installedSoftware.AddHeader("GraalVM")
$graalvm.AddTable($(Build-GraalVMTable))
# Toolcache # Toolcache
$toolcache = $installedSoftware.AddHeader("Cached Tools") $toolcache = $installedSoftware.AddHeader("Cached Tools")
$toolcache.AddNodes($(Build-ToolcacheSection)) $toolcache.AddNodes($(Build-ToolcacheSection))
}
# Rust # Rust
$rust = $installedSoftware.AddHeader("Rust Tools") $rust = $installedSoftware.AddHeader("Rust Tools")
@@ -190,10 +219,13 @@ $powerShellModules = $powerShell.AddHeader("PowerShell Modules")
$powerShellModules.AddNodes($(Get-PowerShellModules)) $powerShellModules.AddNodes($(Get-PowerShellModules))
# Web Servers # Web Servers
$webServers = $installedSoftware.AddHeader("Web Servers") if (-not $os.IsVentura) {
$webServers.AddTable($(Build-WebServersSection)) $webServers = $installedSoftware.AddHeader("Web Servers")
$webServers.AddTable($(Build-WebServersSection))
}
# Xamarin section # Xamarin section
if (-not $os.IsVentura) {
$xamarin = $installedSoftware.AddHeader("Xamarin") $xamarin = $installedSoftware.AddHeader("Xamarin")
$vsForMac = $xamarin.AddHeader("Visual Studio for Mac") $vsForMac = $xamarin.AddHeader("Visual Studio for Mac")
$vsForMac.AddTable($(Build-VSMacTable)) $vsForMac.AddTable($(Build-VSMacTable))
@@ -206,12 +238,12 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app"
$vsForMacNotes = $vsForMac.AddHeader("Notes") $vsForMacNotes = $vsForMac.AddHeader("Notes")
$vsForMacNotes.AddNote($note) $vsForMacNotes.AddNote($note)
$xamarinBundles = $xamarin.AddHeader("Xamarin bundles") $xamarinBundles = $xamarin.AddHeader("Xamarin bundles")
$xamarinBundles.AddTable($(Build-XamarinTable)) $xamarinBundles.AddTable($(Build-XamarinTable))
$unitTestFramework = $xamarin.AddHeader("Unit Test Framework") $unitTestFramework = $xamarin.AddHeader("Unit Test Framework")
$unitTestFramework.AddToolVersion("NUnit", $(Get-NUnitVersion)) $unitTestFramework.AddToolVersion("NUnit", $(Get-NUnitVersion))
}
# Xcode section # Xcode section
$xcode = $installedSoftware.AddHeader("Xcode") $xcode = $installedSoftware.AddHeader("Xcode")
@@ -238,11 +270,13 @@ $android.AddTable($androidTable)
$androidEnv = $android.AddHeader("Environment variables") $androidEnv = $android.AddHeader("Environment variables")
$androidEnv.AddTable($(Build-AndroidEnvironmentTable)) $androidEnv.AddTable($(Build-AndroidEnvironmentTable))
$miscellaneous = $installedSoftware.AddHeader("Miscellaneous") if (-not $os.IsVentura) {
$miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) $miscellaneous = $installedSoftware.AddHeader("Miscellaneous")
$miscellaneous.AddToolVersion("libXft", $(Get-LibXftVersion)) $miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion))
$miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion)) $miscellaneous.AddToolVersion("libXft", $(Get-LibXftVersion))
$miscellaneous.AddToolVersion("Zlib", $(Get-ZlibVersion)) $miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion))
$miscellaneous.AddToolVersion("Zlib", $(Get-ZlibVersion))
}
if ($os.IsMonterey) { if ($os.IsMonterey) {
$miscellaneousEnv = $miscellaneous.AddHeader("Environment variables") $miscellaneousEnv = $miscellaneous.AddHeader("Environment variables")

9
images/macos/tests/Android.Tests.ps1
View File

@@ -51,6 +51,7 @@ Describe "Android" {
} }
Context "SDKManagers" { Context "SDKManagers" {
if (-not $os.IsVentura) {
$testCases = @( $testCases = @(
@{ @{
PackageName = "SDK tools" PackageName = "SDK tools"
@@ -61,6 +62,14 @@ Describe "Android" {
Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
} }
) )
}else {
$testCases = @(
@{
PackageName = "Command-line tools"
Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
}
)
}
It "Sdkmanager from <PackageName> is available" -TestCases $testCases { It "Sdkmanager from <PackageName> is available" -TestCases $testCases {
"$Sdkmanager --version" | Should -ReturnZeroExitCode "$Sdkmanager --version" | Should -ReturnZeroExitCode

12
images/macos/tests/BasicTools.Tests.ps1
View File

@@ -24,7 +24,7 @@ Describe "cmake" {
} }
} }
Describe "Subversion" { Describe "Subversion" -Skip:($os.IsVentura) {
It "Subversion" { It "Subversion" {
"svn --version" | Should -ReturnZeroExitCode "svn --version" | Should -ReturnZeroExitCode
} }
@@ -60,7 +60,7 @@ Describe "Perl" {
} }
} }
Describe "Helm" -Skip:($os.IsMonterey) { Describe "Helm" -Skip:($os.IsMonterey -or $os.IsVentura) {
It "Helm" { It "Helm" {
"helm version --short" | Should -ReturnZeroExitCode "helm version --short" | Should -ReturnZeroExitCode
} }
@@ -108,7 +108,7 @@ Describe "bazel" {
} }
} }
Describe "Aliyun CLI" -Skip:($os.IsMonterey) { Describe "Aliyun CLI" -Skip:($os.IsMonterey -or $os.IsVentura) {
It "Aliyun CLI" { It "Aliyun CLI" {
"aliyun --version" | Should -ReturnZeroExitCode "aliyun --version" | Should -ReturnZeroExitCode
} }
@@ -144,7 +144,7 @@ Describe "vagrant" -Skip:($os.IsBigSur) {
} }
} }
Describe "virtualbox" -Skip:($os.IsBigSur) { Describe "virtualbox" -Skip:($os.IsBigSur -or $os.IsVentura) {
It "virtualbox" { It "virtualbox" {
"vboxmanage -v" | Should -ReturnZeroExitCode "vboxmanage -v" | Should -ReturnZeroExitCode
} }
@@ -170,7 +170,7 @@ Describe "Kotlin" {
} }
} }
Describe "sbt" { Describe "sbt" -Skip:($os.IsVentura) {
It "sbt" { It "sbt" {
"sbt -version" | Should -ReturnZeroExitCode "sbt -version" | Should -ReturnZeroExitCode
} }
@@ -182,7 +182,7 @@ Describe "yq" {
} }
} }
Describe "imagemagick" { Describe "imagemagick" -Skip:($os.IsVentura) {
It "imagemagick" { It "imagemagick" {
"magick -version" | Should -ReturnZeroExitCode "magick -version" | Should -ReturnZeroExitCode
} }

5
images/macos/tests/Git.Tests.ps1
View File

@@ -1,12 +1,13 @@
$os = Get-OSVersion
Describe "Git" { Describe "Git" {
It "git is installed" { It "git is installed" {
"git --version" | Should -ReturnZeroExitCode "git --version" | Should -ReturnZeroExitCode
} }
It "git lfs is installed" { It "git lfs is installed" {
"git lfs version" | Should -ReturnZeroExitCode "git lfs version" | Should -ReturnZeroExitCode
} }
}
Describe "hub CLI" -Skip:($os.IsVentura) {
It "hub CLI is installed" { It "hub CLI is installed" {
"hub --version" | Should -ReturnZeroExitCode "hub --version" | Should -ReturnZeroExitCode
} }

4
images/macos/tests/Java.Tests.ps1
View File

@@ -1,6 +1,8 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
$os = Get-OSVersion
function Get-NativeVersionFormat { function Get-NativeVersionFormat {
param($Version) param($Version)
if ($Version -in "8") { if ($Version -in "8") {
@@ -56,7 +58,7 @@ Describe "Java" {
} }
Context "Java Adopt" { Context "Java Adopt" {
Describe "Java Adopt" { Describe "Java Adopt" -Skip:($os.IsVentura) {
It "Java Adopt <Version>" -TestCases $adoptCases { It "Java Adopt <Version>" -TestCases $adoptCases {
$adoptPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\Contents\Home\bin\java" $adoptPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\Contents\Home\bin\java"

4
images/macos/tests/RubyGem.Tests.ps1
View File

@@ -19,7 +19,7 @@ Describe "Bundler" {
} }
} }
Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey) { Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey -or $os.IsVentura) {
It "Nomad shenzhen CLI" { It "Nomad shenzhen CLI" {
"ipa --version" | Should -ReturnZeroExitCode "ipa --version" | Should -ReturnZeroExitCode
} }
@@ -37,7 +37,7 @@ Describe "xcpretty" {
} }
} }
Describe "jazzy" { Describe "jazzy" -Skip:($os.IsVentura) {
It "jazzy" { It "jazzy" {
"jazzy --version" | Should -ReturnZeroExitCode "jazzy --version" | Should -ReturnZeroExitCode
} }