|
44 | 44 | java-version: "21" |
45 | 45 | - name: Build Windows bundle |
46 | 46 | run: .\\gradlew.bat :lwjgl3:bundleWin -PreleaseNumber="${{ inputs.tag }}" |
47 | | - - name: Build MSI + MSIX (Windows) |
| 47 | + - name: Build MSI (Windows) |
48 | 48 | shell: powershell |
49 | 49 | run: | |
50 | 50 | $ErrorActionPreference = "Stop" |
|
63 | 63 | & $jpackage --type msi --name $appName --app-version $version --vendor "alfu32" ` |
64 | 64 | --input $jarDir --main-jar "k3d-$version.jar" --dest "dist\installer" ` |
65 | 65 | --icon "lwjgl3\icons\logo.ico" --win-per-user-install --win-menu --win-shortcut |
| 66 | + - name: Prepare MSIX layout |
| 67 | + shell: powershell |
| 68 | + run: | |
| 69 | + $ErrorActionPreference = "Stop" |
| 70 | + $version = "${{ inputs.tag }}" |
| 71 | + $appName = "K3D" |
| 72 | + $displayName = "K3D Editor" |
| 73 | + $publisher = "CN=cristian.alferaru@gmail.com" |
| 74 | + $packageName = "com.github.alfu32.k3d" |
66 | 75 |
|
67 | 76 | $appImage = "dist\jpackage\$appName" |
68 | 77 | $msixRoot = "dist\msix\$appName" |
@@ -120,16 +129,12 @@ jobs: |
120 | 129 | $manifest = $manifest.Replace("__APP_NAME__", $appName) |
121 | 130 | $manifestPath = Join-Path $msixRoot "AppxManifest.xml" |
122 | 131 | $manifest | Out-File -Encoding utf8 $manifestPath |
123 | | -
|
124 | | - $makeAppx = Get-Command makeappx.exe -ErrorAction SilentlyContinue |
125 | | - if ($null -eq $makeAppx) { |
126 | | - $sdkBin = Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\bin" -Directory | Sort-Object Name -Descending | Select-Object -First 1 |
127 | | - if ($null -ne $sdkBin) { |
128 | | - $makeAppx = Get-Command (Join-Path $sdkBin.FullName "x64\makeappx.exe") -ErrorAction SilentlyContinue |
129 | | - } |
130 | | - } |
131 | | - if ($null -eq $makeAppx) { throw "MakeAppx.exe not found (Windows SDK required)" } |
132 | | - & $makeAppx.Source pack /d $msixRoot /p "dist\installer\k3d-$version.msix" |
| 132 | + - name: Build MSIX (Windows) |
| 133 | + uses: microsoft/msix-build@v1 |
| 134 | + with: |
| 135 | + sourceDirectory: dist\\msix\\K3D |
| 136 | + outputPath: dist\\installer\\k3d-${{ inputs.tag }}.msix |
| 137 | + manifestPath: dist\\msix\\K3D\\AppxManifest.xml |
133 | 138 | - uses: actions/upload-artifact@v4 |
134 | 139 | with: |
135 | 140 | name: k3d-windows |
|
0 commit comments