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

[macOS] Remove Haskell and Cargo packages (#8775)

Browse Source 
Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”>
This commit is contained in:
Alexey-Ayupov
2023-11-10 18:05:14 +01:00
committed by GitHub
parent 23e386d1c2
commit f685533110
6 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
images/macos/provision/core/rust.sh
View File

@@ -12,7 +12,10 @@ CARGO_HOME=$HOME/.cargo
echo Install common tools... echo Install common tools...
rustup component add rustfmt clippy rustup component add rustfmt clippy
cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated
if is_BigSur || is_Monterey; then
cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated
fi
echo Cleanup Cargo registry cached data... echo Cleanup Cargo registry cached data...
rm -rf $CARGO_HOME/registry/* rm -rf $CARGO_HOME/registry/*

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

@@ -166,7 +166,7 @@ $tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersi
$tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) $tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion))
$tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion))
$tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion))
if (-not $os.IsVenturaArm64) { if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) {
$tools.AddToolVersion("Cabal", $(Get-CabalVersion)) $tools.AddToolVersion("Cabal", $(Get-CabalVersion))
} }
$tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) $tools.AddToolVersion("Cmake", $(Get-CmakeVersion))
@@ -175,11 +175,9 @@ if ($os.IsMonterey) {
$tools.AddToolVersion("Colima", $(Get-ColimaVersion)) $tools.AddToolVersion("Colima", $(Get-ColimaVersion))
} }
$tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) $tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion))
if (-not $os.IsVenturaArm64) { if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) {
$tools.AddToolVersion("GHC", $(Get-GHCVersion)) $tools.AddToolVersion("GHC", $(Get-GHCVersion))
$tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) $tools.AddToolVersion("GHCup", $(Get-GHCupVersion))
}
if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) {
$tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) $tools.AddToolVersion("Jazzy", $(Get-JazzyVersion))
} }
if (-not $os.IsVenturaArm64) { if (-not $os.IsVenturaArm64) {
@@ -222,10 +220,12 @@ if (-not $os.IsSonoma) {
$rust.AddToolVersion("Rustup", $(Get-RustupVersion)) $rust.AddToolVersion("Rustup", $(Get-RustupVersion))
$rustPackages = $rust.AddHeader("Packages") $rustPackages = $rust.AddHeader("Packages")
$rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen)) if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) {
$rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit)) $rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen))
$rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated)) $rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit))
$rustPackages.AddToolVersion("Cbindgen", $(Get-Cbindgen)) $rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated))
$rustPackages.AddToolVersion("Cbindgen", $(Get-Cbindgen))
}
$rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) $rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion))
$rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) $rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion))
} }

1
images/macos/templates/macOS-13.anka.pkr.hcl
View File

@@ -202,7 +202,6 @@ build {
"./provision/core/aws.sh", "./provision/core/aws.sh",
"./provision/core/rust.sh", "./provision/core/rust.sh",
"./provision/core/gcc.sh", "./provision/core/gcc.sh",
"./provision/core/haskell.sh",
"./provision/core/cocoapods.sh", "./provision/core/cocoapods.sh",
"./provision/core/android-toolsets.sh", "./provision/core/android-toolsets.sh",
"./provision/core/apache.sh", "./provision/core/apache.sh",

1
images/macos/templates/macOS-14.anka.pkr.hcl
View File

@@ -202,7 +202,6 @@ build {
"./provision/core/aws.sh", "./provision/core/aws.sh",
"./provision/core/rust.sh", "./provision/core/rust.sh",
"./provision/core/gcc.sh", "./provision/core/gcc.sh",
"./provision/core/haskell.sh",
"./provision/core/cocoapods.sh", "./provision/core/cocoapods.sh",
"./provision/core/android-toolsets.sh", "./provision/core/android-toolsets.sh",
"./provision/core/apache.sh", "./provision/core/apache.sh",

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

@@ -1,7 +1,7 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
$os = Get-OSVersion $os = Get-OSVersion
Describe "Haskell" -Skip:($os.IsVenturaArm64) { Describe "Haskell" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) {
Context "GHCup" { Context "GHCup" {
It "GHCup" { It "GHCup" {
"ghcup --version" | Should -ReturnZeroExitCode "ghcup --version" | Should -ReturnZeroExitCode
@@ -26,4 +26,4 @@ Describe "Haskell" -Skip:($os.IsVenturaArm64) {
"$HOME/.stack/hooks/ghc-install.sh" | Should -Not -Exist "$HOME/.stack/hooks/ghc-install.sh" | Should -Not -Exist
} }
} }
} }

6
images/macos/tests/Rust.Tests.ps1
View File

@@ -1,3 +1,6 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
$os = Get-OSVersion
Describe "Rust" { Describe "Rust" {
Context "Rust" { Context "Rust" {
It "Rustup is installed" { It "Rustup is installed" {
@@ -14,8 +17,7 @@ Describe "Rust" {
"cargo --version" | Should -ReturnZeroExitCode "cargo --version" | Should -ReturnZeroExitCode
} }
} }
Context "Cargo dependencies" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) {
Context "Cargo dependencies" {
It "bindgen" { It "bindgen" {
"bindgen --version" | Should -ReturnZeroExitCode "bindgen --version" | Should -ReturnZeroExitCode
} }