Merge pull request #1072 from aziontech/winget-again

chore: install komac using scoop
aziontech · Jan 27, 2025 · c5a2d93 · c5a2d93
2 parents 7ad1f57 + bfd558d
commit c5a2d93
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 22 deletions.
diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml
@@ -172,31 +172,26 @@ jobs:
     runs-on: windows-latest
     needs: [build, bump_formula]
     steps:
-
-      - name: Register WinGet if not available
+      # 1. Install Scoop
+      - name: Install Scoop
         run: |
-          # Check if Winget is installed
-          if (!(Get-Command winget -ErrorAction SilentlyContinue)) {
-            Write-Host "Winget not found. Attempting to register..."
-            try {
-              Add-AppxPackage -RegisterByFamilyName -MainPackage Microsoft.DesktopAppInstaller_8wekyb3d8bbwe
-              Write-Host "Winget registration triggered successfully."
-            } catch {
-              Write-Error "Failed to register Winget. Ensure administrative privileges are available."
-              exit 1
-            }
-          } else {
-            Write-Host "Winget is already installed."
-          }
+          Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
+          Invoke-RestMethod -Uri https://get.scoop.sh | Invoke-Expression
+        shell: pwsh
 
-      - name: Verify Winget installation
+      # 2. Add the 'extras' bucket
+      - name: Add Extras Bucket
         run: |
-          winget --version
-          
-      - name: install komac
+          scoop bucket add extras
+        shell: pwsh
+
+      # 3. Install Komac using Scoop
+      - name: Install Komac
         run: |
-          winget install komac
+          scoop install komac
         shell: pwsh
+
+      # 4. Use Komac to update the Azion package
       - name: Update Azion Package
         shell: pwsh
         run: |
@@ -209,4 +204,3 @@ jobs:
             --submit `
             -t ${{ secrets.RELEASE_GITHUB_TOKEN }}
 
-
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
@@ -106,7 +106,7 @@ if [ -f "$full_main_go_path" ]; then
             echo "Running cmd/azion/main.go deploy --debug"
             # go run "$full_main_go_path" deploy --debug
             # uncomment the line below and comment the line above if using a built binary file
-            "$full_bin_path" deploy --debug
+            "$full_bin_path" deploy --debug --local
 
             # Check the exit status of the deploy command
             if [ $? -eq 0 ]; then