2929 APPLE_TEAM_ID : ${{ secrets.APPLE_TEAM_ID }}
3030 STARQUERY_WINDOWS_CERTIFICATE_BASE64 : ${{ secrets.STARQUERY_WINDOWS_CERTIFICATE_BASE64 }}
3131 STARQUERY_WINDOWS_CERTIFICATE_PASSWORD : ${{ secrets.STARQUERY_WINDOWS_CERTIFICATE_PASSWORD }}
32+ STARQUERY_MSIX_WINDOWS_KIT_VERSION : ${{ vars.STARQUERY_MSIX_WINDOWS_KIT_VERSION }}
33+ STARQUERY_MSIX_WINDOWS_KIT_PATH : ${{ vars.STARQUERY_MSIX_WINDOWS_KIT_PATH }}
3234 strategy :
3335 fail-fast : false
3436 matrix :
@@ -117,6 +119,23 @@ jobs:
117119 )
118120 "WINDOWS_CERTIFICATE_FILE=$certificatePath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
119121
122+ - name : Detect Windows SDK for MSIX
123+ if : runner.os == 'Windows' && env.STARQUERY_MSIX_WINDOWS_KIT_PATH == '' && env.STARQUERY_MSIX_WINDOWS_KIT_VERSION == ''
124+ shell : pwsh
125+ run : |
126+ $windowsKitBinRoot = 'C:\Program Files (x86)\Windows Kits\10\bin'
127+ $candidates = Get-ChildItem $windowsKitBinRoot -Directory |
128+ Where-Object { Test-Path (Join-Path $_.FullName 'x64\makeappx.exe') } |
129+ Sort-Object Name -Descending
130+
131+ if (-not $candidates -or $candidates.Count -eq 0) {
132+ throw "No usable Windows SDK with makeappx.exe found under $windowsKitBinRoot"
133+ }
134+
135+ $selectedVersion = $candidates[0].Name
136+ "STARQUERY_MSIX_WINDOWS_KIT_VERSION=$selectedVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
137+ Write-Host "Using Windows SDK version $selectedVersion for MSIX packaging"
138+
120139 - name : Build Electron distributables
121140 env :
122141 STARQUERY_MAC_SIGN : ${{ runner.os == 'macOS' && env.APPLE_SIGN_CERTIFICATE_P12_BASE64 != '' && 'true' || 'false' }}
@@ -137,8 +156,6 @@ jobs:
137156 STARQUERY_MSIX_BACKGROUND_COLOR : ${{ vars.STARQUERY_MSIX_BACKGROUND_COLOR }}
138157 STARQUERY_MSIX_MIN_OS_VERSION : ${{ vars.STARQUERY_MSIX_MIN_OS_VERSION }}
139158 STARQUERY_MSIX_MAX_OS_VERSION_TESTED : ${{ vars.STARQUERY_MSIX_MAX_OS_VERSION_TESTED }}
140- STARQUERY_MSIX_WINDOWS_KIT_VERSION : ${{ vars.STARQUERY_MSIX_WINDOWS_KIT_VERSION }}
141- STARQUERY_MSIX_WINDOWS_KIT_PATH : ${{ vars.STARQUERY_MSIX_WINDOWS_KIT_PATH }}
142159 STARQUERY_MSIX_SIGN : ${{ vars.STARQUERY_MSIX_SIGN }}
143160 WINDOWS_CERTIFICATE_PASSWORD : ${{ env.STARQUERY_WINDOWS_CERTIFICATE_PASSWORD }}
144161 run : pnpm --dir packages/electron make
0 commit comments