From 0cc9b40cec6aaec554099ebdd6df1d0c70361a2e Mon Sep 17 00:00:00 2001
From: EduardGomezEscandell <edu.gomez.escandell@canonical.com>
Date: Thu, 21 Sep 2023 10:49:18 +0200
Subject: [PATCH] Move build-appx under buid-service.

Fail fast!
---
 .github/workflows/qa-azure.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/qa-azure.yaml b/.github/workflows/qa-azure.yaml
index c44d5df4b..eda559063 100644
--- a/.github/workflows/qa-azure.yaml
+++ b/.github/workflows/qa-azure.yaml
@@ -67,19 +67,13 @@ jobs:
           $pwd = ConvertTo-SecureString '${{ secrets.CERTIFICATE_PASSWORD }}' -AsPlainText -Force
           Import-PfxCertificate -Password $pwd -CertStoreLocation Cert:LocalMachine\Trust -FilePath certificate\certificate.pfx
           Import-PfxCertificate -Password $pwd -CertStoreLocation Cert:CurrentUser\My -FilePath certificate\certificate.pfx
-      - name: Build Appx
-        shell: powershell
-        run: |
-          New-Item -ItemType Directory "ci-build/windows-agent"
-          Get-AppxPackage -Name "CanonicalGroupLimited.UbuntuProForWindows" | Remove-AppxPackage
-          .\tools\build\build-appx.ps1 -OutputDir "ci-build/windows-agent" -SkipInstall
       - name: Build WSL-Pro-Service
         shell: powershell
         run: |
           Copy-Item -Path "${HOME}/.gitconfig" -Destination "\\wsl$\Ubuntu-Preview\etc\gitconfig"
 
           Write-Output "::group::Point internal dependencies to this branch"
-          $want_version = "${{ github.ref_name }}"
+          $want_version = "${{ github.sha }}".Substring(0, 12)
           $dependencies = $(go mod edit -json | jq -r @"
               .Require[]
               | select(.Path | startswith("github.com/${{ github.repository }}"))
@@ -92,6 +86,12 @@ jobs:
 
           New-Item -ItemType Directory "ci-build/wsl-pro-service"
           .\tools\build\build-deb.ps1 -OutputDir "ci-build/wsl-pro-service"
+      - name: Build Appx
+        shell: powershell
+        run: |
+          New-Item -ItemType Directory "ci-build/windows-agent"
+          Get-AppxPackage -Name "CanonicalGroupLimited.UbuntuProForWindows" | Remove-AppxPackage
+          .\tools\build\build-appx.ps1 -OutputDir "ci-build/windows-agent" -SkipInstall
       - name: Test
         shell: powershell
         env: