actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 13:17:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[macos11] Remove php package (#9237)

Browse Source
This commit is contained in:
Shamil Mubarakshin
2024-01-27 11:05:44 +01:00
committed by GitHub
parent 47e2999afb
commit 8f1339b65b
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1
View File

@@ -53,7 +53,7 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) {
$languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') $languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+')
} }
$languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion))
if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { if ((-not $os.IsBigSur) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) {
$languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion))
} }

4
images/macos/scripts/tests/PHP.Tests.ps1
View File

@@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
$os = Get-OSVersion $os = Get-OSVersion
Describe "PHP" { Describe "PHP" {
Context "PHP" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { Context "PHP" -Skip:($os.IsBigSur -or $os.IsVenturaArm64 -or $os.IsSonomaArm64) {
It "PHP Path" { It "PHP Path" {
Get-ToolPath "php" | Should -Not -BeLike "/usr/bin/php*" Get-ToolPath "php" | Should -Not -BeLike "/usr/bin/php*"
} }
@@ -14,7 +14,7 @@ Describe "PHP" {
} }
} }
Context "Composer" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { Context "Composer" -Skip:($os.IsBigSur -or $os.IsVenturaArm64 -or $os.IsSonomaArm64) {
It "Composer" { It "Composer" {
"composer --version" | Should -ReturnZeroExitCode "composer --version" | Should -ReturnZeroExitCode
} }

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

@@ -244,7 +244,6 @@ build {
"${path.root}/../scripts/build/install-golang.sh", "${path.root}/../scripts/build/install-golang.sh",
"${path.root}/../scripts/build/install-swiftlint.sh", "${path.root}/../scripts/build/install-swiftlint.sh",
"${path.root}/../scripts/build/install-openjdk.sh", "${path.root}/../scripts/build/install-openjdk.sh",
"${path.root}/../scripts/build/install-php.sh",
"${path.root}/../scripts/build/install-aws-tools.sh", "${path.root}/../scripts/build/install-aws-tools.sh",
"${path.root}/../scripts/build/install-rust.sh", "${path.root}/../scripts/build/install-rust.sh",
"${path.root}/../scripts/build/install-gcc.sh", "${path.root}/../scripts/build/install-gcc.sh",

3
images/macos/toolsets/toolset-11.json
View File

@@ -352,9 +352,6 @@
"llvm": { "llvm": {
"version": "15" "version": "15"
}, },
"php": {
"version": "8.3"
},
"mongodb": { "mongodb": {
"version": "5.0" "version": "5.0"
}, },