chore: use nushell in ci

delulu-hq · Jan 10, 2025 · 67e2237 · 67e2237
1 parent b55101c
commit 67e2237
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -59,15 +59,25 @@ jobs:
       shell: powershell 
       run: |
         $progressPreference = 'silentlyContinue'
-        $package = '${{github.workspace}}/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle';
-        $deps = @(
+        $packages = @(
+            'https://aka.ms/Microsoft.VCLibs.arm64.14.00.Desktop.appx',
             '${{github.workspace}}/Microsoft.UI.Xaml.2.8.arm64.appx',
-            'https://aka.ms/Microsoft.VCLibs.arm64.14.00.Desktop.appx'
+            '${{github.workspace}}/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle'
         )
 
-        Write-Host "Installing Microsoft.DesktopAppInstaller from "
-        Add-AppxPackage -Path $package -DependencyPath $deps
-
+        foreach ($package in $packages) {
+          Write-Host "Installing package from $package..."
+      
+          # If it's the Desktop App Installer, install it with dependencies
+          if ($package -eq '${{github.workspace}}/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle') {
+              Add-AppxPackage -Path $package -DependencyPath 'https://aka.ms/Microsoft.VCLibs.arm64.14.00.Desktop.appx', '${{github.workspace}}/Microsoft.UI.Xaml.2.8.arm64.appx'
+          }
+          else {
+              # Install the other packages without dependencies
+              Add-AppxPackage -Path $package
+          }
+        }
+        
         Repair-WinGetPackageManager -IncludePrerelease
         winget install nushell --accept-package-agreements --accept-source-agreements