Remove Windows Terminal testing on windows-2019

mandiant · Jan 31, 2024 · 68f32b9 · 68f32b9
1 parent 9d1218a
commit 68f32b9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,17 +38,24 @@ jobs:
       - name: Build and test all modified packages
         id: test
         # It runs only if there are modified files
+        # We specifically test for "microsoft-windows-terminal.vm" in 'windows-2019' because it requires at least Windows 10 version 1903/OS build 18362
         if: steps.files.outputs.added_modified_renamed != ''
         run: |
+          $os = "${{ matrix.os }}"
           $packages = "${{ steps.files.outputs.added_modified_renamed }}".Split(" ") | Foreach-Object { (Get-Item $_).Directory.Name }
-          scripts/test/test_install.ps1 "common.vm $packages"
+          if ($os -eq 'windows-2019') {
+            $excludedPackages = @("microsoft-windows-terminal.vm")
+            $packages = $packages | Where-Object { $_ -notin $excludedPackages }
+          }
+          $packages = ("common.vm" + $packages -join " ").Trim()
+          scripts/test/test_install.ps1 "$packages"
       - name: Upload logs to artifacts
         uses: ./.github/actions/upload-logs
         if: always()
       - name: Push all built packages to MyGet
         # Only push packages on master if they were built (not if testing was skipped) and
         # only with one version of Windows (otherwise it would be pushed 3 times)
-        if: steps.test.outcome == 'success' && github.event_name == 'push' && matrix.os == 'windows-2019'
+        if: steps.test.outcome == 'success' && github.event_name == 'push' && matrix.os == 'windows-2022'
         run: |
           $built_pkgs = Get-ChildItem built_pkgs
           Set-Location built_pkgs

diff --git a/packages/microsoft-windows-terminal.vm/tools/chocolateyuninstall.ps1 b/packages/microsoft-windows-terminal.vm/tools/chocolateyuninstall.ps1
@@ -2,6 +2,10 @@ $ErrorActionPreference = 'Continue'
 Import-Module vm.common -Force -DisableNameChecking
 
 $toolName = 'Microsoft Windows Terminal'
-$category = 'Utilities'
+$shortcutDir = ${Env:RAW_TOOLS_DIR}
+$shortcut = Join-Path $shortcutDir "$toolName.lnk"
 
-VM-Remove-Tool-Shortcut $toolName $category
+$AppxPackageName = "Microsoft.WindowsTerminal"
+Remove-AppxPackage -AllUsers -Package (Get-AppxPackage -Name $AppxPackageName -AllUsers -PackageTypeFilter Bundle)
+
+Remove-Item $shortcut -Force -ea 0 | Out-Null