Skip to content

Commit 465a701

Browse files
author
alferio
committed
fix(rm): releas.yaml
1 parent bd9875c commit 465a701

1 file changed

Lines changed: 16 additions & 11 deletions

File tree

.github/workflows/release.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
java-version: "21"
4545
- name: Build Windows bundle
4646
run: .\\gradlew.bat :lwjgl3:bundleWin -PreleaseNumber="${{ inputs.tag }}"
47-
- name: Build MSI + MSIX (Windows)
47+
- name: Build MSI (Windows)
4848
shell: powershell
4949
run: |
5050
$ErrorActionPreference = "Stop"
@@ -63,6 +63,15 @@ jobs:
6363
& $jpackage --type msi --name $appName --app-version $version --vendor "alfu32" `
6464
--input $jarDir --main-jar "k3d-$version.jar" --dest "dist\installer" `
6565
--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"
6675
6776
$appImage = "dist\jpackage\$appName"
6877
$msixRoot = "dist\msix\$appName"
@@ -120,16 +129,12 @@ jobs:
120129
$manifest = $manifest.Replace("__APP_NAME__", $appName)
121130
$manifestPath = Join-Path $msixRoot "AppxManifest.xml"
122131
$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
133138
- uses: actions/upload-artifact@v4
134139
with:
135140
name: k3d-windows

0 commit comments

Comments
 (0)