[macos11] Remove php package (actions#9237)

mikhailkoliada · Jan 27, 2024 · 8f1339b · 8f1339b
1 parent 47e2999
commit 8f1339b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1
@@ -53,7 +53,7 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) {
     $languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+')
 }
 $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))
 }
 

diff --git a/images/macos/scripts/tests/PHP.Tests.ps1 b/images/macos/scripts/tests/PHP.Tests.ps1
@@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
 $os = Get-OSVersion
 
 Describe "PHP" {
-    Context "PHP" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) {
+    Context "PHP" -Skip:($os.IsBigSur -or $os.IsVenturaArm64 -or $os.IsSonomaArm64) {
         It "PHP Path" {
             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" {
             "composer --version" | Should -ReturnZeroExitCode
         }

diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl
@@ -244,7 +244,6 @@ build {
       "${path.root}/../scripts/build/install-golang.sh",
       "${path.root}/../scripts/build/install-swiftlint.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-rust.sh",
       "${path.root}/../scripts/build/install-gcc.sh",

diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json
@@ -352,9 +352,6 @@
     "llvm": {
         "version": "15"
     },
-    "php": {
-        "version": "8.3"
-    },
     "mongodb": {
         "version": "5.0"
     },